|
a/upmpd/avtransport.cxx |
|
b/upmpd/avtransport.cxx |
|
... |
|
... |
309 |
string metadata;
|
309 |
string metadata;
|
310 |
it = setnext? sc.args.find("NextURIMetaData") :
|
310 |
it = setnext? sc.args.find("NextURIMetaData") :
|
311 |
sc.args.find("CurrentURIMetaData");
|
311 |
sc.args.find("CurrentURIMetaData");
|
312 |
if (it != sc.args.end())
|
312 |
if (it != sc.args.end())
|
313 |
metadata = it->second;
|
313 |
metadata = it->second;
|
314 |
//cerr << "SetTransport: setnext " << setnext << " metadata[" << metadata <<
|
314 |
LOGDEB("Set(next)AVTransportURI: next " << setnext << " uri " << uri <<
|
315 |
// "]" << endl;
|
315 |
" metadata[" << metadata << "]" << endl);
|
316 |
|
316 |
|
317 |
if ((m_dev->m_options & UpMpd::upmpdOwnQueue) && !setnext) {
|
317 |
if ((m_dev->m_options & UpMpd::upmpdOwnQueue) && !setnext) {
|
318 |
// If we own the queue, just clear it before setting the
|
318 |
// If we own the queue, just clear it before setting the
|
319 |
// track. Else it's difficult to impossible to prevent it
|
319 |
// track. Else it's difficult to impossible to prevent it
|
320 |
// from growing if upmpdcli restarts. If the option is not set, the
|
320 |
// from growing if upmpdcli restarts. If the option is not set, the
|
|
... |
|
... |
324 |
|
324 |
|
325 |
const MpdStatus &mpds = m_dev->getMpdStatus();
|
325 |
const MpdStatus &mpds = m_dev->getMpdStatus();
|
326 |
bool is_song = (mpds.state == MpdStatus::MPDS_PLAY) ||
|
326 |
bool is_song = (mpds.state == MpdStatus::MPDS_PLAY) ||
|
327 |
(mpds.state == MpdStatus::MPDS_PAUSE);
|
327 |
(mpds.state == MpdStatus::MPDS_PAUSE);
|
328 |
int curpos = mpds.songpos;
|
328 |
int curpos = mpds.songpos;
|
329 |
LOGDEB("UpMpdAVTransport::set" << (setnext?"Next":"") <<
|
329 |
LOGDEB1("UpMpdAVTransport::set" << (setnext?"Next":"") <<
|
330 |
"AVTransportURI: curpos: " <<
|
330 |
"AVTransportURI: curpos: " <<
|
331 |
curpos << " is_song " << is_song << " qlen " << mpds.qlen << endl);
|
331 |
curpos << " is_song " << is_song << " qlen " << mpds.qlen << endl);
|
332 |
|
332 |
|
333 |
// curpos == -1 means that the playlist was cleared or we just started. A
|
333 |
// curpos == -1 means that the playlist was cleared or we just started. A
|
334 |
// play will use position 0, so it's actually equivalent to curpos == 0
|
334 |
// play will use position 0, so it's actually equivalent to curpos == 0
|
335 |
if (curpos == -1) {
|
335 |
if (curpos == -1) {
|
336 |
curpos = 0;
|
336 |
curpos = 0;
|