|
a/src/mpdcli.cxx |
|
b/src/mpdcli.cxx |
|
... |
|
... |
| 244 |
return found;
|
244 |
return found;
|
| 245 |
}
|
245 |
}
|
| 246 |
|
246 |
|
| 247 |
bool MPDCli::statSong(UpSong& upsong, int pos, bool isid)
|
247 |
bool MPDCli::statSong(UpSong& upsong, int pos, bool isid)
|
| 248 |
{
|
248 |
{
|
| 249 |
//LOGDEB("MPDCli::statSong. isid " << isid << " id/pos " << pos << endl);
|
249 |
//LOGDEB1("MPDCli::statSong. isid " << isid << " id/pos " << pos << endl);
|
| 250 |
if (!ok())
|
250 |
if (!ok())
|
| 251 |
return false;
|
251 |
return false;
|
| 252 |
|
252 |
|
| 253 |
struct mpd_song *song;
|
253 |
struct mpd_song *song;
|
| 254 |
if (isid == false) {
|
254 |
if (isid == false) {
|
|
... |
|
... |
| 270 |
return true;
|
270 |
return true;
|
| 271 |
}
|
271 |
}
|
| 272 |
|
272 |
|
| 273 |
UpSong& MPDCli::mapSong(UpSong& upsong, struct mpd_song *song)
|
273 |
UpSong& MPDCli::mapSong(UpSong& upsong, struct mpd_song *song)
|
| 274 |
{
|
274 |
{
|
| 275 |
LOGDEB1("MPDCli::mapSong" << endl);
|
275 |
//LOGDEB1("MPDCli::mapSong" << endl);
|
| 276 |
const char *cp;
|
276 |
const char *cp;
|
| 277 |
|
277 |
|
| 278 |
cp = mpd_song_get_uri(song);
|
278 |
cp = mpd_song_get_uri(song);
|
| 279 |
if (cp != 0)
|
279 |
if (cp != 0)
|
| 280 |
upsong.uri = cp;
|
280 |
upsong.uri = cp;
|
|
... |
|
... |
| 655 |
return false;
|
655 |
return false;
|
| 656 |
}
|
656 |
}
|
| 657 |
|
657 |
|
| 658 |
bool MPDCli::getQueueSongs(vector<mpd_song*>& songs)
|
658 |
bool MPDCli::getQueueSongs(vector<mpd_song*>& songs)
|
| 659 |
{
|
659 |
{
|
| 660 |
LOGDEB1("MPDCli::getQueueSongs" << endl);
|
660 |
//LOGDEB1("MPDCli::getQueueSongs" << endl);
|
| 661 |
songs.clear();
|
661 |
songs.clear();
|
| 662 |
|
662 |
|
| 663 |
RETRY_CMD(mpd_send_list_queue_meta(M_CONN));
|
663 |
RETRY_CMD(mpd_send_list_queue_meta(M_CONN));
|
| 664 |
|
664 |
|
| 665 |
struct mpd_song *song;
|
665 |
struct mpd_song *song;
|
|
... |
|
... |
| 684 |
}
|
684 |
}
|
| 685 |
}
|
685 |
}
|
| 686 |
|
686 |
|
| 687 |
bool MPDCli::getQueueData(std::vector<UpSong>& vdata)
|
687 |
bool MPDCli::getQueueData(std::vector<UpSong>& vdata)
|
| 688 |
{
|
688 |
{
|
| 689 |
//LOGDEB("MPDCli::getQueueData" << endl);
|
689 |
LOGDEB("MPDCli::getQueueData" << endl);
|
| 690 |
vector<mpd_song*> songs;
|
690 |
vector<mpd_song*> songs;
|
| 691 |
if (!getQueueSongs(songs)) {
|
691 |
if (!getQueueSongs(songs)) {
|
| 692 |
return false;
|
692 |
return false;
|
| 693 |
}
|
693 |
}
|
| 694 |
vdata.reserve(songs.size());
|
694 |
vdata.reserve(songs.size());
|