| 1 |
< |
// Beep Remote |
| 1 |
> |
// Display (Crystalfontz CFA-635 USB LCD) |
| 2 |
|
// |
| 3 |
|
// Douglas Thrift |
| 4 |
|
// |
| 5 |
|
// $Id$ |
| 6 |
|
|
| 7 |
< |
#include <cxx/standard.hh> |
| 7 |
> |
#include <foreach.hpp> |
| 8 |
|
|
| 9 |
< |
#include <audacious/beepctrl.h> |
| 9 |
> |
#include <iostream> |
| 10 |
|
|
| 11 |
< |
#include "Audacious.hpp" |
| 11 |
> |
#include <fcntl.h> |
| 12 |
> |
#include <termios.h> |
| 13 |
|
|
| 14 |
< |
void Audacious::Playlist(char **list, int size, bool enqueue) |
| 14 |
< |
{ |
| 15 |
< |
::xmms_remote_playlist(session, list, size, enqueue); |
| 16 |
< |
} |
| 17 |
< |
|
| 18 |
< |
int Audacious::GetVersion() const |
| 19 |
< |
{ |
| 20 |
< |
return ::xmms_remote_get_version(session); |
| 21 |
< |
} |
| 22 |
< |
|
| 23 |
< |
void Audacious::PlaylistAdd(::GList *list) |
| 24 |
< |
{ |
| 25 |
< |
::xmms_remote_playlist_add(session, list); |
| 26 |
< |
} |
| 27 |
< |
|
| 28 |
< |
void Audacious::PlaylistDelete(int position) |
| 29 |
< |
{ |
| 30 |
< |
::xmms_remote_playlist_delete(session, position); |
| 31 |
< |
} |
| 32 |
< |
|
| 33 |
< |
void Audacious::Play() |
| 34 |
< |
{ |
| 35 |
< |
::xmms_remote_play(session); |
| 36 |
< |
} |
| 37 |
< |
|
| 38 |
< |
void Audacious::Pause() |
| 39 |
< |
{ |
| 40 |
< |
::xmms_remote_pause(session); |
| 41 |
< |
} |
| 42 |
< |
|
| 43 |
< |
void Audacious::Stop() |
| 44 |
< |
{ |
| 45 |
< |
::xmms_remote_stop(session); |
| 46 |
< |
} |
| 47 |
< |
|
| 48 |
< |
bool Audacious::IsPlaying() const |
| 49 |
< |
{ |
| 50 |
< |
return ::xmms_remote_is_playing(session); |
| 51 |
< |
} |
| 52 |
< |
|
| 53 |
< |
bool Audacious::IsPaused() const |
| 54 |
< |
{ |
| 55 |
< |
return ::xmms_remote_is_paused(session); |
| 56 |
< |
} |
| 57 |
< |
|
| 58 |
< |
int Audacious::GetPlaylistPosition() const |
| 59 |
< |
{ |
| 60 |
< |
return ::xmms_remote_get_playlist_pos(session); |
| 61 |
< |
} |
| 62 |
< |
|
| 63 |
< |
void Audacious::SetPlaylistPosition(int position) |
| 64 |
< |
{ |
| 65 |
< |
::xmms_remote_set_playlist_pos(session, position); |
| 66 |
< |
} |
| 67 |
< |
|
| 68 |
< |
int Audacious::GetPlaylistLength() const |
| 69 |
< |
{ |
| 70 |
< |
return ::xmms_remote_get_playlist_length(session); |
| 71 |
< |
} |
| 72 |
< |
|
| 73 |
< |
void Audacious::PlaylistClear() |
| 74 |
< |
{ |
| 75 |
< |
return ::xmms_remote_playlist_clear(session); |
| 76 |
< |
} |
| 77 |
< |
|
| 78 |
< |
int Audacious::GetOutputTime() const |
| 79 |
< |
{ |
| 80 |
< |
return ::xmms_remote_get_output_time(session); |
| 81 |
< |
} |
| 82 |
< |
|
| 83 |
< |
void Audacious::JumpToTime(int position) |
| 84 |
< |
{ |
| 85 |
< |
::xmms_remote_jump_to_time(session, position); |
| 86 |
< |
} |
| 87 |
< |
|
| 88 |
< |
void Audacious::GetVolume(int& left, int& right) const |
| 89 |
< |
{ |
| 90 |
< |
::xmms_remote_get_volume(session, &left, &right); |
| 91 |
< |
} |
| 92 |
< |
|
| 93 |
< |
int Audacious::GetMainVolume() const |
| 94 |
< |
{ |
| 95 |
< |
return ::xmms_remote_get_main_volume(session); |
| 96 |
< |
} |
| 97 |
< |
|
| 98 |
< |
int Audacious::GetBalance() const |
| 99 |
< |
{ |
| 100 |
< |
return ::xmms_remote_get_balance(session); |
| 101 |
< |
} |
| 102 |
< |
|
| 103 |
< |
void Audacious::SetVolume(int left, int right) |
| 104 |
< |
{ |
| 105 |
< |
::xmms_remote_set_volume(session, left, right); |
| 106 |
< |
} |
| 107 |
< |
|
| 108 |
< |
void Audacious::SetMainVolume(int volume) |
| 109 |
< |
{ |
| 110 |
< |
::xmms_remote_set_main_volume(session, volume); |
| 111 |
< |
} |
| 112 |
< |
|
| 113 |
< |
void Audacious::SetBalance(int balance) |
| 114 |
< |
{ |
| 115 |
< |
::xmms_remote_set_balance(session, balance); |
| 116 |
< |
} |
| 117 |
< |
|
| 118 |
< |
cse::String Audacious::GetSkin() const |
| 119 |
< |
{ |
| 120 |
< |
return ::xmms_remote_get_skin(session); |
| 121 |
< |
} |
| 122 |
< |
|
| 123 |
< |
void Audacious::SetSkin(const cse::String &skin) |
| 124 |
< |
{ |
| 125 |
< |
::xmms_remote_set_skin(session, const_cast<char*>(skin.NullTerminate())); |
| 126 |
< |
} |
| 127 |
< |
|
| 128 |
< |
cse::String Audacious::GetPlaylistFile(int position) const |
| 129 |
< |
{ |
| 130 |
< |
return ::xmms_remote_get_playlist_file(session, position); |
| 131 |
< |
} |
| 132 |
< |
|
| 133 |
< |
cse::String Audacious::GetPlaylistTitle(int position) const |
| 134 |
< |
{ |
| 135 |
< |
return ::xmms_remote_get_playlist_title(session, position); |
| 136 |
< |
} |
| 137 |
< |
|
| 138 |
< |
int Audacious::GetPlaylistTime(int position) const |
| 139 |
< |
{ |
| 140 |
< |
return ::xmms_remote_get_playlist_time(session, position); |
| 141 |
< |
} |
| 142 |
< |
|
| 143 |
< |
void Audacious::GetInfo(int &rate, int &frequency, int &channels) const |
| 144 |
< |
{ |
| 145 |
< |
::xmms_remote_get_info(session, &rate, &frequency, &channels); |
| 146 |
< |
} |
| 147 |
< |
|
| 148 |
< |
void Audacious::MainWindowToggle(bool show) |
| 149 |
< |
{ |
| 150 |
< |
::xmms_remote_main_win_toggle(session, show); |
| 151 |
< |
} |
| 152 |
< |
|
| 153 |
< |
void Audacious::PlaylistWindowToggle(bool show) |
| 154 |
< |
{ |
| 155 |
< |
::xmms_remote_pl_win_toggle(session, show); |
| 156 |
< |
} |
| 157 |
< |
|
| 158 |
< |
void Audacious::EqualizerWindowToggle(bool show) |
| 159 |
< |
{ |
| 160 |
< |
::xmms_remote_eq_win_toggle(session, show); |
| 161 |
< |
} |
| 162 |
< |
|
| 163 |
< |
bool Audacious::IsMainWindow() const |
| 164 |
< |
{ |
| 165 |
< |
return ::xmms_remote_is_main_win(session); |
| 166 |
< |
} |
| 167 |
< |
|
| 168 |
< |
bool Audacious::IsPlaylistWindow() const |
| 169 |
< |
{ |
| 170 |
< |
return ::xmms_remote_is_pl_win(session); |
| 171 |
< |
} |
| 172 |
< |
|
| 173 |
< |
bool Audacious::IsEqualizerWindow() const |
| 174 |
< |
{ |
| 175 |
< |
return ::xmms_remote_is_eq_win(session); |
| 176 |
< |
} |
| 177 |
< |
|
| 178 |
< |
void Audacious::ShowPreferencesBox() |
| 179 |
< |
{ |
| 180 |
< |
::xmms_remote_show_prefs_box(session); |
| 181 |
< |
} |
| 182 |
< |
|
| 183 |
< |
void Audacious::ToggleAlwaysOnTop(bool always) |
| 184 |
< |
{ |
| 185 |
< |
::xmms_remote_toggle_aot(session, always); |
| 186 |
< |
} |
| 187 |
< |
|
| 188 |
< |
void Audacious::Eject() |
| 189 |
< |
{ |
| 190 |
< |
::xmms_remote_eject(session); |
| 191 |
< |
} |
| 192 |
< |
|
| 193 |
< |
void Audacious::PlaylistPrevious() |
| 194 |
< |
{ |
| 195 |
< |
::xmms_remote_playlist_prev(session); |
| 196 |
< |
} |
| 197 |
< |
|
| 198 |
< |
void Audacious::PlaylistNext() |
| 199 |
< |
{ |
| 200 |
< |
::xmms_remote_playlist_next(session); |
| 201 |
< |
} |
| 202 |
< |
|
| 203 |
< |
void Audacious::PlaylistAddUrl(const cse::String &url) |
| 204 |
< |
{ |
| 205 |
< |
::xmms_remote_playlist_add_url_string(session, const_cast<char*>(url.NullTerminate())); |
| 206 |
< |
} |
| 207 |
< |
|
| 208 |
< |
bool Audacious::IsRunning() const |
| 209 |
< |
{ |
| 210 |
< |
return ::xmms_remote_is_running(session); |
| 211 |
< |
} |
| 212 |
< |
|
| 213 |
< |
void Audacious::ToggleRepeat() |
| 214 |
< |
{ |
| 215 |
< |
::xmms_remote_toggle_repeat(session); |
| 216 |
< |
} |
| 217 |
< |
|
| 218 |
< |
void Audacious::ToggleShuffle() |
| 219 |
< |
{ |
| 220 |
< |
::xmms_remote_toggle_shuffle(session); |
| 221 |
< |
} |
| 14 |
> |
#include "Display.hpp" |
| 15 |
|
|
| 16 |
< |
bool Audacious::IsRepeat() const |
| 224 |
< |
{ |
| 225 |
< |
return ::xmms_remote_is_repeat(session); |
| 226 |
< |
} |
| 16 |
> |
extern bool debug; |
| 17 |
|
|
| 18 |
< |
bool Audacious::IsShuffle() const |
| 18 |
> |
static uint16_t GetCRC(uint8_t *buffer, size_t length) |
| 19 |
|
{ |
| 20 |
< |
return ::xmms_remote_is_shuffle(session); |
| 21 |
< |
} |
| 20 |
> |
static const uint16_t table[256] = { |
| 21 |
> |
0x00000, 0x01189, 0x02312, 0x0329b, 0x04624, 0x057ad, 0x06536, 0x074bf, |
| 22 |
> |
0x08C48, 0x09DC1, 0x0AF5A, 0x0BED3, 0x0CA6C, 0x0DBE5, 0x0E97E, 0x0F8F7, |
| 23 |
> |
0x01081, 0x00108, 0x03393, 0x0221a, 0x056a5, 0x0472c, 0x075b7, 0x0643e, |
| 24 |
> |
0x09CC9, 0x08D40, 0x0BFDB, 0x0AE52, 0x0DAED, 0x0CB64, 0x0F9FF, 0x0E876, |
| 25 |
> |
0x02102, 0x0308b, 0x00210, 0x01399, 0x06726, 0x076af, 0x04434, 0x055bd, |
| 26 |
> |
0x0AD4A, 0x0BCC3, 0x08E58, 0x09FD1, 0x0EB6E, 0x0FAE7, 0x0C87C, 0x0D9F5, |
| 27 |
> |
0x03183, 0x0200a, 0x01291, 0x00318, 0x077a7, 0x0662e, 0x054b5, 0x0453c, |
| 28 |
> |
0x0BDCB, 0x0AC42, 0x09ED9, 0x08F50, 0x0FBEF, 0x0EA66, 0x0D8FD, 0x0C974, |
| 29 |
> |
0x04204, 0x0538d, 0x06116, 0x0709f, 0x00420, 0x015a9, 0x02732, 0x036bb, |
| 30 |
> |
0x0ce4c, 0x0dfc5, 0x0ed5e, 0x0fcd7, 0x08868, 0x099e1, 0x0ab7a, 0x0baf3, |
| 31 |
> |
0x05285, 0x0430c, 0x07197, 0x0601e, 0x014a1, 0x00528, 0x037b3, 0x0263a, |
| 32 |
> |
0x0decd, 0x0cf44, 0x0fddf, 0x0ec56, 0x098e9, 0x08960, 0x0bbfb, 0x0aa72, |
| 33 |
> |
0x06306, 0x0728f, 0x04014, 0x0519d, 0x02522, 0x034ab, 0x00630, 0x017b9, |
| 34 |
> |
0x0EF4E, 0x0FEC7, 0x0CC5C, 0x0DDD5, 0x0A96A, 0x0B8E3, 0x08A78, 0x09BF1, |
| 35 |
> |
0x07387, 0x0620e, 0x05095, 0x0411c, 0x035a3, 0x0242a, 0x016b1, 0x00738, |
| 36 |
> |
0x0FFCF, 0x0EE46, 0x0DCDD, 0x0CD54, 0x0B9EB, 0x0A862, 0x09AF9, 0x08B70, |
| 37 |
> |
0x08408, 0x09581, 0x0a71a, 0x0b693, 0x0c22c, 0x0d3a5, 0x0e13e, 0x0f0b7, |
| 38 |
> |
0x00840, 0x019c9, 0x02b52, 0x03adb, 0x04e64, 0x05fed, 0x06d76, 0x07cff, |
| 39 |
> |
0x09489, 0x08500, 0x0b79b, 0x0a612, 0x0d2ad, 0x0c324, 0x0f1bf, 0x0e036, |
| 40 |
> |
0x018c1, 0x00948, 0x03bd3, 0x02a5a, 0x05ee5, 0x04f6c, 0x07df7, 0x06c7e, |
| 41 |
> |
0x0a50a, 0x0b483, 0x08618, 0x09791, 0x0e32e, 0x0f2a7, 0x0c03c, 0x0d1b5, |
| 42 |
> |
0x02942, 0x038cb, 0x00a50, 0x01bd9, 0x06f66, 0x07eef, 0x04c74, 0x05dfd, |
| 43 |
> |
0x0b58b, 0x0a402, 0x09699, 0x08710, 0x0f3af, 0x0e226, 0x0d0bd, 0x0c134, |
| 44 |
> |
0x039C3, 0x0284A, 0x01AD1, 0x00B58, 0x07FE7, 0x06E6E, 0x05CF5, 0x04D7C, |
| 45 |
> |
0x0c60c, 0x0d785, 0x0e51e, 0x0f497, 0x08028, 0x091a1, 0x0a33a, 0x0b2b3, |
| 46 |
> |
0x04a44, 0x05bcd, 0x06956, 0x078df, 0x00c60, 0x01de9, 0x02f72, 0x03efb, |
| 47 |
> |
0x0d68d, 0x0c704, 0x0f59f, 0x0e416, 0x090a9, 0x08120, 0x0b3bb, 0x0a232, |
| 48 |
> |
0x05AC5, 0x04B4C, 0x079D7, 0x0685E, 0x01CE1, 0x00D68, 0x03FF3, 0x02E7A, |
| 49 |
> |
0x0e70e, 0x0f687, 0x0c41c, 0x0d595, 0x0a12a, 0x0b0a3, 0x08238, 0x093b1, |
| 50 |
> |
0x06b46, 0x07acf, 0x04854, 0x059dd, 0x02d62, 0x03ceb, 0x00e70, 0x01ff9, |
| 51 |
> |
0x0f78f, 0x0e606, 0x0d49d, 0x0c514, 0x0b1ab, 0x0a022, 0x092b9, 0x08330, |
| 52 |
> |
0x07BC7, 0x06A4E, 0x058D5, 0x0495C, 0x03DE3, 0x02C6A, 0x01EF1, 0x00F78, |
| 53 |
> |
}; |
| 54 |
> |
register uint16_t crc(0xffff); |
| 55 |
|
|
| 56 |
< |
void Audacious::GetEqualizer(float& preamp, float bands[10]) const |
| 57 |
< |
{ |
| 235 |
< |
float* bands_; |
| 56 |
> |
while (length--) |
| 57 |
> |
crc = (crc >> 8) ^ table[(crc ^ *buffer++) & 0xff]; |
| 58 |
|
|
| 59 |
< |
::xmms_remote_get_eq(session, &preamp, &bands_); |
| 238 |
< |
|
| 239 |
< |
_forall (uint8_t, index, 0, 10) |
| 240 |
< |
bands[index] = bands[index]; |
| 241 |
< |
|
| 242 |
< |
::g_free(bands_); |
| 59 |
> |
return ~crc; |
| 60 |
|
} |
| 61 |
|
|
| 62 |
< |
float Audacious::GetEqualizerPreamp() const |
| 62 |
> |
Display::Packet::Packet(Display::Packet::Command command, uint8_t length, const uint8_t *data) : command(command), length(length) |
| 63 |
|
{ |
| 64 |
< |
return ::xmms_remote_get_eq_preamp(session); |
| 65 |
< |
} |
| 64 |
> |
if (length > sizeof (this->data)) |
| 65 |
> |
throw; |
| 66 |
|
|
| 67 |
< |
float Audacious::GetEqualizerBand(int band) const |
| 251 |
< |
{ |
| 252 |
< |
return ::xmms_remote_get_eq_band(session, band); |
| 253 |
< |
} |
| 67 |
> |
::memcpy(this->data, data, length); |
| 68 |
|
|
| 69 |
< |
void Audacious::SetEqualizer(float preamp, float bands[10]) |
| 256 |
< |
{ |
| 257 |
< |
::xmms_remote_set_eq(session, preamp, bands); |
| 69 |
> |
crc = GetCRC(reinterpret_cast<uint8_t *>(this), length + 2); |
| 70 |
|
} |
| 71 |
|
|
| 72 |
< |
void Audacious::SetEqualizerPreamp(float preamp) |
| 72 |
> |
void operator<<(int fd, const Display::Packet::Packet &packet) |
| 73 |
|
{ |
| 74 |
< |
::xmms_remote_set_eq_preamp(session, preamp); |
| 75 |
< |
} |
| 74 |
> |
if (packet.length != sizeof (packet.data)) |
| 75 |
> |
::memcpy(const_cast<uint8_t *>(packet.data) + packet.length, &packet.crc, 2); |
| 76 |
|
|
| 77 |
< |
void Audacious::SetEqualizerBand(int band, float value) |
| 266 |
< |
{ |
| 267 |
< |
::xmms_remote_set_eq_band(session, band, value); |
| 77 |
> |
Posix::Write(fd, &packet, packet.length + 4); |
| 78 |
|
} |
| 79 |
|
|
| 80 |
< |
// XMMS 1.2.1 |
| 271 |
< |
void Audacious::Quit() |
| 80 |
> |
void operator>>(int fd, Display::Packet::Packet &packet) |
| 81 |
|
{ |
| 82 |
< |
::xmms_remote_quit(session); |
| 83 |
< |
} |
| 82 |
> |
Posix::Read(fd, &packet, 2); |
| 83 |
> |
Posix::Read(fd, packet.data, packet.length); |
| 84 |
> |
Posix::Read(fd, &packet.crc, 2); |
| 85 |
|
|
| 86 |
< |
// XMMS 1.2.6 |
| 87 |
< |
void Audacious::PlayPause() |
| 88 |
< |
{ |
| 279 |
< |
::xmms_remote_play_pause(session); |
| 280 |
< |
} |
| 86 |
> |
if (debug) |
| 87 |
> |
{ |
| 88 |
> |
char *data; |
| 89 |
|
|
| 90 |
< |
void Audacious::PlaylistInsertUrl(const cse::String &url, int position) |
| 283 |
< |
{ |
| 284 |
< |
::xmms_remote_playlist_ins_url_string(session, const_cast<char*>(url.NullTerminate()), position); |
| 285 |
< |
} |
| 90 |
> |
::asprintf(&data, "0x%02x %i ", packet.command, packet.length); |
| 91 |
|
|
| 92 |
< |
// XMMS 1.2.11 |
| 288 |
< |
void Audacious::PlayqueueAdd(int position) |
| 289 |
< |
{ |
| 290 |
< |
::xmms_remote_playqueue_add(session, position); |
| 291 |
< |
} |
| 92 |
> |
std::cerr << data << '[' << packet.GetData() << ']' << std::endl; |
| 93 |
|
|
| 94 |
< |
void Audacious::PlayqueueRemove(int position) |
| 95 |
< |
{ |
| 295 |
< |
::xmms_remote_playqueue_remove(session, position); |
| 94 |
> |
std::free(data); |
| 95 |
> |
} |
| 96 |
|
} |
| 97 |
|
|
| 98 |
< |
int Audacious::GetPlayqueueLength() const |
| 98 |
> |
Display::Display(const std::string &device) : ucom(Posix::Open(device, O_RDWR | O_NOCTTY)) |
| 99 |
|
{ |
| 100 |
< |
return ::xmms_remote_get_playqueue_length(session); |
| 301 |
< |
} |
| 302 |
< |
|
| 303 |
< |
void Audacious::ToggleAdvance() |
| 304 |
< |
{ |
| 305 |
< |
::xmms_remote_toggle_advance(session); |
| 306 |
< |
} |
| 100 |
> |
::termios state; |
| 101 |
|
|
| 102 |
< |
bool Audacious::IsAdvance() const |
| 103 |
< |
{ |
| 104 |
< |
return ::xmms_remote_is_advance(session); |
| 311 |
< |
} |
| 102 |
> |
Posix::CheckError(::tcgetattr(ucom, &state)); |
| 103 |
> |
Posix::CheckError(::cfsetospeed(&state, B115200)); |
| 104 |
> |
Posix::CheckError(::cfsetispeed(&state, B115200)); |
| 105 |
|
|
| 106 |
< |
// BMP 0.9.7 |
| 107 |
< |
void Audacious::Activate() |
| 108 |
< |
{ |
| 109 |
< |
::xmms_remote_activate(session); |
| 110 |
< |
} |
| 106 |
> |
state.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | INPCK | ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXOFF); |
| 107 |
> |
state.c_iflag |= IGNPAR; |
| 108 |
> |
state.c_oflag &= ~(OPOST | ONLCR | ONOCR | ONLRET); |
| 109 |
> |
state.c_cflag &= ~(CSIZE | PARENB | PARODD | HUPCL | CRTSCTS); |
| 110 |
> |
state.c_cflag |= CREAD | CS8 | CSTOPB | CLOCAL; |
| 111 |
> |
state.c_lflag &= ~(ISIG | ICANON | IEXTEN | ECHO); |
| 112 |
> |
state.c_lflag |= NOFLSH; |
| 113 |
|
|
| 114 |
< |
// Audacious 1.1 |
| 320 |
< |
void Audacious::ShowJumpToFileBox() |
| 321 |
< |
{ |
| 322 |
< |
::xmms_remote_show_jtf_box(session); |
| 114 |
> |
Posix::CheckError(::tcsetattr(ucom, TCSANOW, &state)); |
| 115 |
|
} |
| 116 |
|
|
| 117 |
< |
void Audacious::PlayqueueClear() |
| 117 |
> |
Display::Packet Display::Communicate_(Display::Packet::Command command, uint8_t length, const uint8_t *data) |
| 118 |
|
{ |
| 119 |
< |
::xmms_remote_playqueue_clear(session); |
| 328 |
< |
} |
| 119 |
> |
Packet packet(command, length, data), response; |
| 120 |
|
|
| 121 |
< |
bool Audacious::PlayqueueIsQueued(int position) const |
| 331 |
< |
{ |
| 332 |
< |
return ::xmms_remote_playqueue_is_queued(session, position); |
| 333 |
< |
} |
| 121 |
> |
ucom << packet; |
| 122 |
|
|
| 123 |
< |
int Audacious::GetPlayqueuePosition(int position) const |
| 124 |
< |
{ |
| 125 |
< |
return ::xmms_remote_get_playqueue_position(session, position); |
| 338 |
< |
} |
| 123 |
> |
_forever |
| 124 |
> |
{ |
| 125 |
> |
ucom >> response; |
| 126 |
|
|
| 127 |
< |
int Audacious::GetPlayqueueQueuePosition(int position) const |
| 128 |
< |
{ |
| 342 |
< |
return ::xmms_remote_get_playqueue_queue_position(session, position); |
| 343 |
< |
} |
| 127 |
> |
if (packet.command | Packet::Response == response.command) |
| 128 |
> |
return response; |
| 129 |
|
|
| 130 |
< |
// Audacious 1.2 |
| 131 |
< |
void Audacious::SetSessionUri(const cse::String &uri) |
| 132 |
< |
{ |
| 133 |
< |
::audacious_set_session_uri(const_cast<char *>(uri.NullTerminate())); |
| 349 |
< |
} |
| 130 |
> |
switch (response.command) |
| 131 |
> |
{ |
| 132 |
> |
case Packet::KeyActivity: |
| 133 |
> |
keyActivity.push(response); |
| 134 |
|
|
| 135 |
< |
cse::String Audacious::GetSessionUri() const |
| 136 |
< |
{ |
| 137 |
< |
return ::audacious_get_session_uri(session); |
| 135 |
> |
break; |
| 136 |
> |
case Packet::FanSpeedReport: |
| 137 |
> |
case Packet::TemperatureSensorReport: |
| 138 |
> |
break; |
| 139 |
> |
} |
| 140 |
> |
} |
| 141 |
|
} |
| 142 |
|
|
| 143 |
< |
void Audacious::SetSessionType(Type type) |
| 143 |
> |
bool Display::Ping(const std::string &data) |
| 144 |
|
{ |
| 145 |
< |
::audacious_set_session_type(type); |
| 145 |
> |
return data == Communicate<const std::string &>(Packet::PingCommand, data).GetData(); |
| 146 |
|
} |
| 147 |
|
|
| 148 |
< |
// Audacious 1.3 |
| 362 |
< |
void Audacious::PlaylistEnqueueToTemp(const cse::String &string) |
| 148 |
> |
std::string Display::Version() |
| 149 |
|
{ |
| 150 |
< |
::xmms_remote_playlist_enqueue_to_temp(session, const_cast<char *>(string.NullTerminate())); |
| 150 |
> |
return Communicate(Packet::GetHardwareAndFirmwareVersion).GetData(); |
| 151 |
|
} |
| 152 |
|
|
| 153 |
< |
cse::String Audacious::GetTupleFieldData(const cse::String &field, int position) |
| 153 |
> |
void Display::Set(uint8_t column, uint8_t row, const std::string &data) |
| 154 |
|
{ |
| 155 |
< |
return ::audacious_get_tuple_field_data(session, const_cast<char *>(field.NullTerminate()), position); |
| 155 |
> |
Communicate<uint8_t, uint8_t, const std::string &>(Packet::SendDataToLCD, column, row, data); |
| 156 |
|
} |
