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 |
> |
#include <scopes.hpp> |
9 |
> |
#include <timing.hpp> |
10 |
|
|
11 |
< |
#include <audacious/beepctrl.h> |
11 |
> |
#include <iomanip> |
12 |
> |
#include <iostream> |
13 |
|
|
14 |
< |
#include "Audacious.hpp" |
14 |
> |
#include <fcntl.h> |
15 |
> |
#include <termios.h> |
16 |
|
|
17 |
< |
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 |
< |
} |
17 |
> |
#include "Display.hpp" |
18 |
|
|
19 |
< |
cse::String Audacious::GetPlaylistFile(int position) const |
129 |
< |
{ |
130 |
< |
return ::xmms_remote_get_playlist_file(session, position); |
131 |
< |
} |
19 |
> |
extern bool debug; |
20 |
|
|
21 |
< |
cse::String Audacious::GetPlaylistTitle(int position) const |
21 |
> |
static uint16_t GetCRC(uint8_t *buffer, size_t length) |
22 |
|
{ |
23 |
< |
return ::xmms_remote_get_playlist_title(session, position); |
24 |
< |
} |
23 |
> |
static const uint16_t table[256] = { |
24 |
> |
0x00000, 0x01189, 0x02312, 0x0329b, 0x04624, 0x057ad, 0x06536, 0x074bf, |
25 |
> |
0x08C48, 0x09DC1, 0x0AF5A, 0x0BED3, 0x0CA6C, 0x0DBE5, 0x0E97E, 0x0F8F7, |
26 |
> |
0x01081, 0x00108, 0x03393, 0x0221a, 0x056a5, 0x0472c, 0x075b7, 0x0643e, |
27 |
> |
0x09CC9, 0x08D40, 0x0BFDB, 0x0AE52, 0x0DAED, 0x0CB64, 0x0F9FF, 0x0E876, |
28 |
> |
0x02102, 0x0308b, 0x00210, 0x01399, 0x06726, 0x076af, 0x04434, 0x055bd, |
29 |
> |
0x0AD4A, 0x0BCC3, 0x08E58, 0x09FD1, 0x0EB6E, 0x0FAE7, 0x0C87C, 0x0D9F5, |
30 |
> |
0x03183, 0x0200a, 0x01291, 0x00318, 0x077a7, 0x0662e, 0x054b5, 0x0453c, |
31 |
> |
0x0BDCB, 0x0AC42, 0x09ED9, 0x08F50, 0x0FBEF, 0x0EA66, 0x0D8FD, 0x0C974, |
32 |
> |
0x04204, 0x0538d, 0x06116, 0x0709f, 0x00420, 0x015a9, 0x02732, 0x036bb, |
33 |
> |
0x0ce4c, 0x0dfc5, 0x0ed5e, 0x0fcd7, 0x08868, 0x099e1, 0x0ab7a, 0x0baf3, |
34 |
> |
0x05285, 0x0430c, 0x07197, 0x0601e, 0x014a1, 0x00528, 0x037b3, 0x0263a, |
35 |
> |
0x0decd, 0x0cf44, 0x0fddf, 0x0ec56, 0x098e9, 0x08960, 0x0bbfb, 0x0aa72, |
36 |
> |
0x06306, 0x0728f, 0x04014, 0x0519d, 0x02522, 0x034ab, 0x00630, 0x017b9, |
37 |
> |
0x0EF4E, 0x0FEC7, 0x0CC5C, 0x0DDD5, 0x0A96A, 0x0B8E3, 0x08A78, 0x09BF1, |
38 |
> |
0x07387, 0x0620e, 0x05095, 0x0411c, 0x035a3, 0x0242a, 0x016b1, 0x00738, |
39 |
> |
0x0FFCF, 0x0EE46, 0x0DCDD, 0x0CD54, 0x0B9EB, 0x0A862, 0x09AF9, 0x08B70, |
40 |
> |
0x08408, 0x09581, 0x0a71a, 0x0b693, 0x0c22c, 0x0d3a5, 0x0e13e, 0x0f0b7, |
41 |
> |
0x00840, 0x019c9, 0x02b52, 0x03adb, 0x04e64, 0x05fed, 0x06d76, 0x07cff, |
42 |
> |
0x09489, 0x08500, 0x0b79b, 0x0a612, 0x0d2ad, 0x0c324, 0x0f1bf, 0x0e036, |
43 |
> |
0x018c1, 0x00948, 0x03bd3, 0x02a5a, 0x05ee5, 0x04f6c, 0x07df7, 0x06c7e, |
44 |
> |
0x0a50a, 0x0b483, 0x08618, 0x09791, 0x0e32e, 0x0f2a7, 0x0c03c, 0x0d1b5, |
45 |
> |
0x02942, 0x038cb, 0x00a50, 0x01bd9, 0x06f66, 0x07eef, 0x04c74, 0x05dfd, |
46 |
> |
0x0b58b, 0x0a402, 0x09699, 0x08710, 0x0f3af, 0x0e226, 0x0d0bd, 0x0c134, |
47 |
> |
0x039C3, 0x0284A, 0x01AD1, 0x00B58, 0x07FE7, 0x06E6E, 0x05CF5, 0x04D7C, |
48 |
> |
0x0c60c, 0x0d785, 0x0e51e, 0x0f497, 0x08028, 0x091a1, 0x0a33a, 0x0b2b3, |
49 |
> |
0x04a44, 0x05bcd, 0x06956, 0x078df, 0x00c60, 0x01de9, 0x02f72, 0x03efb, |
50 |
> |
0x0d68d, 0x0c704, 0x0f59f, 0x0e416, 0x090a9, 0x08120, 0x0b3bb, 0x0a232, |
51 |
> |
0x05AC5, 0x04B4C, 0x079D7, 0x0685E, 0x01CE1, 0x00D68, 0x03FF3, 0x02E7A, |
52 |
> |
0x0e70e, 0x0f687, 0x0c41c, 0x0d595, 0x0a12a, 0x0b0a3, 0x08238, 0x093b1, |
53 |
> |
0x06b46, 0x07acf, 0x04854, 0x059dd, 0x02d62, 0x03ceb, 0x00e70, 0x01ff9, |
54 |
> |
0x0f78f, 0x0e606, 0x0d49d, 0x0c514, 0x0b1ab, 0x0a022, 0x092b9, 0x08330, |
55 |
> |
0x07BC7, 0x06A4E, 0x058D5, 0x0495C, 0x03DE3, 0x02C6A, 0x01EF1, 0x00F78, |
56 |
> |
}; |
57 |
> |
register uint16_t crc(0xffff); |
58 |
|
|
59 |
< |
int Audacious::GetPlaylistTime(int position) const |
60 |
< |
{ |
140 |
< |
return ::xmms_remote_get_playlist_time(session, position); |
141 |
< |
} |
59 |
> |
while (length--) |
60 |
> |
crc = (crc >> 8) ^ table[(crc ^ *buffer++) & 0xff]; |
61 |
|
|
62 |
< |
void Audacious::GetInfo(int &rate, int &frequency, int &channels) const |
144 |
< |
{ |
145 |
< |
::xmms_remote_get_info(session, &rate, &frequency, &channels); |
62 |
> |
return ~crc; |
63 |
|
} |
64 |
|
|
65 |
< |
void Audacious::MainWindowToggle(bool show) |
65 |
> |
Display::Packet::Packet(Display::Packet::Command command, uint8_t length, const uint8_t *data) : command(command), length(length) |
66 |
|
{ |
67 |
< |
::xmms_remote_main_win_toggle(session, show); |
68 |
< |
} |
67 |
> |
if (length > sizeof (this->data)) |
68 |
> |
throw; |
69 |
|
|
70 |
< |
void Audacious::PlaylistWindowToggle(bool show) |
154 |
< |
{ |
155 |
< |
::xmms_remote_pl_win_toggle(session, show); |
156 |
< |
} |
70 |
> |
::memcpy(this->data, data, length); |
71 |
|
|
72 |
< |
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); |
72 |
> |
crc = GetCRC(reinterpret_cast<uint8_t *>(this), length + 2); |
73 |
|
} |
74 |
|
|
75 |
< |
bool Audacious::IsPlaylistWindow() const |
75 |
> |
std::ostream &operator<<(std::ostream &output, const Display::Packet &packet) |
76 |
|
{ |
77 |
< |
return ::xmms_remote_is_pl_win(session); |
77 |
> |
return output << _B("0x") << std::hex << std::setw(2) << std::setfill('0') << unsigned(packet.command) << _B(" [") << packet.GetData() << ']'; |
78 |
|
} |
79 |
|
|
80 |
< |
bool Audacious::IsEqualizerWindow() const |
80 |
> |
void operator<<(int fd, const Display::Packet &packet) |
81 |
|
{ |
82 |
< |
return ::xmms_remote_is_eq_win(session); |
83 |
< |
} |
177 |
< |
|
178 |
< |
void Audacious::ShowPreferencesBox() |
179 |
< |
{ |
180 |
< |
::xmms_remote_show_prefs_box(session); |
181 |
< |
} |
82 |
> |
if (packet.length != sizeof (packet.data)) |
83 |
> |
::memcpy(const_cast<uint8_t *>(packet.data) + packet.length, &packet.crc, 2); |
84 |
|
|
85 |
< |
void Audacious::ToggleAlwaysOnTop(bool always) |
86 |
< |
{ |
185 |
< |
::xmms_remote_toggle_aot(session, always); |
186 |
< |
} |
85 |
> |
if (debug) |
86 |
> |
std::cerr << _B("<< ") << packet << std::endl; |
87 |
|
|
88 |
< |
void Audacious::Eject() |
189 |
< |
{ |
190 |
< |
::xmms_remote_eject(session); |
88 |
> |
Posix::Write(fd, &packet, packet.length + 4); |
89 |
|
} |
90 |
|
|
91 |
< |
void Audacious::PlaylistPrevious() |
91 |
> |
void operator>>(int fd, Display::Packet &packet) |
92 |
|
{ |
93 |
< |
::xmms_remote_playlist_prev(session); |
94 |
< |
} |
93 |
> |
Posix::Read(fd, &packet, 2); |
94 |
> |
Posix::Read(fd, packet.data, packet.length); |
95 |
> |
Posix::Read(fd, &packet.crc, 2); |
96 |
|
|
97 |
< |
void Audacious::PlaylistNext() |
98 |
< |
{ |
200 |
< |
::xmms_remote_playlist_next(session); |
97 |
> |
if (debug) |
98 |
> |
std::cerr << _B(">> ") << packet << std::endl; |
99 |
|
} |
100 |
|
|
101 |
< |
void Audacious::PlaylistAddUrl(const cse::String &url) |
101 |
> |
void Communicate(Display *display) |
102 |
|
{ |
103 |
< |
::xmms_remote_playlist_add_url_string(session, const_cast<char*>(url.NullTerminate())); |
103 |
> |
display->Communicate_(); |
104 |
|
} |
105 |
|
|
106 |
< |
bool Audacious::IsRunning() const |
106 |
> |
Display::Display(const std::string &device) : ucom(Posix::Open(device, O_RDWR | O_NOCTTY | O_NONBLOCK)), ucomCondition(ucomLock), running(true), responsesCondition(responsesLock), thread(reinterpret_cast<void *(*)(void *)>(::Communicate), this) |
107 |
|
{ |
108 |
< |
return ::xmms_remote_is_running(session); |
211 |
< |
} |
108 |
> |
::termios state; |
109 |
|
|
110 |
< |
void Audacious::ToggleRepeat() |
111 |
< |
{ |
112 |
< |
::xmms_remote_toggle_repeat(session); |
216 |
< |
} |
110 |
> |
Posix::CheckError(::tcgetattr(ucom, &state)); |
111 |
> |
Posix::CheckError(::cfsetospeed(&state, B115200)); |
112 |
> |
Posix::CheckError(::cfsetispeed(&state, B115200)); |
113 |
|
|
114 |
< |
void Audacious::ToggleShuffle() |
115 |
< |
{ |
116 |
< |
::xmms_remote_toggle_shuffle(session); |
117 |
< |
} |
114 |
> |
state.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | INPCK | ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXOFF); |
115 |
> |
state.c_iflag |= IGNPAR; |
116 |
> |
state.c_oflag &= ~(OPOST | ONLCR | ONOCR | ONLRET); |
117 |
> |
state.c_cflag &= ~(CSIZE | PARENB | PARODD | HUPCL | CRTSCTS); |
118 |
> |
state.c_cflag |= CREAD | CS8 | CSTOPB | CLOCAL; |
119 |
> |
state.c_lflag &= ~(ISIG | ICANON | IEXTEN | ECHO); |
120 |
> |
state.c_lflag |= NOFLSH; |
121 |
|
|
122 |
< |
bool Audacious::IsRepeat() const |
224 |
< |
{ |
225 |
< |
return ::xmms_remote_is_repeat(session); |
226 |
< |
} |
122 |
> |
Posix::CheckError(::tcsetattr(ucom, TCSANOW, &state)); |
123 |
|
|
124 |
< |
bool Audacious::IsShuffle() const |
125 |
< |
{ |
230 |
< |
return ::xmms_remote_is_shuffle(session); |
124 |
> |
_synchronized (ucomLock) |
125 |
> |
ucomCondition.Signal(); |
126 |
|
} |
127 |
|
|
128 |
< |
void Audacious::GetEqualizer(float& preamp, float bands[10]) const |
128 |
> |
Display::~Display() |
129 |
|
{ |
130 |
< |
float* bands_; |
130 |
> |
running = false; |
131 |
|
|
132 |
< |
::xmms_remote_get_eq(session, &preamp, &bands_); |
132 |
> |
thread.Join(); |
133 |
|
|
134 |
< |
_forall (uint8_t, index, 0, 10) |
240 |
< |
bands[index] = bands[index]; |
241 |
< |
|
242 |
< |
::g_free(bands_); |
243 |
< |
} |
244 |
< |
|
245 |
< |
float Audacious::GetEqualizerPreamp() const |
246 |
< |
{ |
247 |
< |
return ::xmms_remote_get_eq_preamp(session); |
134 |
> |
Posix::Close(ucom); |
135 |
|
} |
136 |
|
|
137 |
< |
float Audacious::GetEqualizerBand(int band) const |
137 |
> |
void Display::Communicate_() |
138 |
|
{ |
139 |
< |
return ::xmms_remote_get_eq_band(session, band); |
140 |
< |
} |
139 |
> |
_synchronized (ucomLock) |
140 |
> |
ucomCondition.Wait(); |
141 |
|
|
142 |
< |
void Audacious::SetEqualizer(float preamp, float bands[10]) |
143 |
< |
{ |
144 |
< |
::xmms_remote_set_eq(session, preamp, bands); |
258 |
< |
} |
142 |
> |
while (running) |
143 |
> |
{ |
144 |
> |
Packet response; |
145 |
|
|
146 |
< |
void Audacious::SetEqualizerPreamp(float preamp) |
147 |
< |
{ |
148 |
< |
::xmms_remote_set_eq_preamp(session, preamp); |
149 |
< |
} |
146 |
> |
_synchronized (ucomLock) |
147 |
> |
try |
148 |
> |
{ |
149 |
> |
ucom >> response; |
150 |
> |
} |
151 |
> |
catch (const Posix::Error error) |
152 |
> |
{ |
153 |
> |
if (error.what() != _B("Resource temporarily unavailable")) |
154 |
> |
throw error; |
155 |
|
|
156 |
< |
void Audacious::SetEqualizerBand(int band, float value) |
157 |
< |
{ |
267 |
< |
::xmms_remote_set_eq_band(session, band, value); |
268 |
< |
} |
156 |
> |
goto next; |
157 |
> |
} |
158 |
|
|
159 |
< |
// XMMS 1.2.1 |
160 |
< |
void Audacious::Quit() |
161 |
< |
{ |
162 |
< |
::xmms_remote_quit(session); |
163 |
< |
} |
159 |
> |
if ((response.command & Packet::Error) == Packet::Error); |
160 |
> |
else if ((response.command & Packet::Report) == Packet::Report) |
161 |
> |
switch (response.command) |
162 |
> |
{ |
163 |
> |
case Packet::KeyActivity: |
164 |
> |
_synchronized (keyActivityLock) |
165 |
> |
keyActivity.push(response); |
166 |
|
|
167 |
< |
// XMMS 1.2.6 |
168 |
< |
void Audacious::PlayPause() |
169 |
< |
{ |
170 |
< |
::xmms_remote_play_pause(session); |
171 |
< |
} |
167 |
> |
break; |
168 |
> |
case Packet::FanSpeedReport: |
169 |
> |
case Packet::TemperatureSensorReport: |
170 |
> |
break; |
171 |
> |
} |
172 |
> |
else if ((response.command & Packet::Response) == Packet::Response) |
173 |
> |
_synchronized (responsesLock) |
174 |
> |
{ |
175 |
> |
responses.push(response); |
176 |
> |
responsesCondition.Signal(); |
177 |
> |
} |
178 |
|
|
179 |
< |
void Audacious::PlaylistInsertUrl(const cse::String &url, int position) |
180 |
< |
{ |
284 |
< |
::xmms_remote_playlist_ins_url_string(session, const_cast<char*>(url.NullTerminate()), position); |
179 |
> |
next: Timing::NanoSleep(Timing::Time(0, 10000000)); |
180 |
> |
} |
181 |
|
} |
182 |
|
|
183 |
< |
// XMMS 1.2.11 |
288 |
< |
void Audacious::PlayqueueAdd(int position) |
183 |
> |
Display::Packet Display::Communicate_(Display::Packet::Command command, uint8_t length, const uint8_t *data) |
184 |
|
{ |
185 |
< |
::xmms_remote_playqueue_add(session, position); |
291 |
< |
} |
185 |
> |
Packet packet(command, length, data); |
186 |
|
|
187 |
< |
void Audacious::PlayqueueRemove(int position) |
188 |
< |
{ |
189 |
< |
::xmms_remote_playqueue_remove(session, position); |
296 |
< |
} |
187 |
> |
retry: |
188 |
> |
_synchronized (ucomLock) |
189 |
> |
ucom << packet; |
190 |
|
|
191 |
< |
int Audacious::GetPlayqueueLength() const |
192 |
< |
{ |
193 |
< |
return ::xmms_remote_get_playqueue_length(session); |
194 |
< |
} |
191 |
> |
_synchronized (responsesLock) |
192 |
> |
{ |
193 |
> |
while (responses.empty()) |
194 |
> |
try |
195 |
> |
{ |
196 |
> |
responsesCondition.Wait(Timing::GetTimeOfDay() += 1); |
197 |
> |
} |
198 |
> |
catch (const Posix::Error &error) |
199 |
> |
{ |
200 |
> |
if (error.what() != _B("Operation timed out")) |
201 |
> |
throw error; |
202 |
|
|
203 |
< |
void Audacious::ToggleAdvance() |
204 |
< |
{ |
305 |
< |
::xmms_remote_toggle_advance(session); |
306 |
< |
} |
203 |
> |
goto retry; |
204 |
> |
} |
205 |
|
|
206 |
< |
bool Audacious::IsAdvance() const |
309 |
< |
{ |
310 |
< |
return ::xmms_remote_is_advance(session); |
311 |
< |
} |
206 |
> |
Packet response(responses.front()); |
207 |
|
|
208 |
< |
// BMP 0.9.7 |
314 |
< |
void Audacious::Activate() |
315 |
< |
{ |
316 |
< |
::xmms_remote_activate(session); |
317 |
< |
} |
208 |
> |
responses.pop(); |
209 |
|
|
210 |
< |
// Audacious 1.1 |
320 |
< |
void Audacious::ShowJumpToFileBox() |
321 |
< |
{ |
322 |
< |
::xmms_remote_show_jtf_box(session); |
323 |
< |
} |
210 |
> |
assert ((packet.command | Packet::Response) == response.command); |
211 |
|
|
212 |
< |
void Audacious::PlayqueueClear() |
213 |
< |
{ |
327 |
< |
::xmms_remote_playqueue_clear(session); |
328 |
< |
} |
212 |
> |
return response; |
213 |
> |
} |
214 |
|
|
215 |
< |
bool Audacious::PlayqueueIsQueued(int position) const |
331 |
< |
{ |
332 |
< |
return ::xmms_remote_playqueue_is_queued(session, position); |
215 |
> |
throw; |
216 |
|
} |
217 |
|
|
218 |
< |
int Audacious::GetPlayqueuePosition(int position) const |
218 |
> |
bool Display::Ping(const std::string &data) |
219 |
|
{ |
220 |
< |
return ::xmms_remote_get_playqueue_position(session, position); |
220 |
> |
return data == Communicate<const std::string &>(Packet::PingCommand, data).GetData(); |
221 |
|
} |
222 |
|
|
223 |
< |
int Audacious::GetPlayqueueQueuePosition(int position) const |
223 |
> |
std::string Display::Version() |
224 |
|
{ |
225 |
< |
return ::xmms_remote_get_playqueue_queue_position(session, position); |
225 |
> |
return Communicate(Packet::GetHardwareAndFirmwareVersion).GetData(); |
226 |
|
} |
227 |
|
|
228 |
< |
// Audacious 1.2 |
346 |
< |
void Audacious::SetSessionUri(const cse::String &uri) |
228 |
> |
void Display::Set(uint8_t column, uint8_t row, const std::string &data) |
229 |
|
{ |
230 |
< |
::audacious_set_session_uri(const_cast<char *>(uri.NullTerminate())); |
230 |
> |
Communicate(Packet::SendDataToLCD, column, row, data); |
231 |
|
} |
232 |
|
|
233 |
< |
cse::String Audacious::GetSessionUri() const |
233 |
> |
Display::KeyActivity Display::GetKeyActivity() |
234 |
|
{ |
235 |
< |
return ::audacious_get_session_uri(session); |
236 |
< |
} |
235 |
> |
_synchronized (keyActivityLock) |
236 |
> |
if (keyActivity.size()) |
237 |
> |
{ |
238 |
> |
KeyActivity activity(KeyActivity(*keyActivity.front().data)); |
239 |
|
|
240 |
< |
void Audacious::SetSessionType(Type type) |
357 |
< |
{ |
358 |
< |
::audacious_set_session_type(type); |
359 |
< |
} |
240 |
> |
keyActivity.pop(); |
241 |
|
|
242 |
< |
// Audacious 1.3 |
243 |
< |
void Audacious::PlaylistEnqueueToTemp(const cse::String &string) |
363 |
< |
{ |
364 |
< |
::xmms_remote_playlist_enqueue_to_temp(session, const_cast<char *>(string.NullTerminate())); |
365 |
< |
} |
242 |
> |
return activity; |
243 |
> |
} |
244 |
|
|
245 |
< |
cse::String Audacious::GetTupleFieldData(const cse::String &field, int position) |
368 |
< |
{ |
369 |
< |
return ::audacious_get_tuple_field_data(session, const_cast<char *>(field.NullTerminate()), position); |
245 |
> |
return None; |
246 |
|
} |