Switch to unified view

a/src/ohplaylist.cxx b/src/ohplaylist.cxx
...
...
226
    const MpdStatus &mpds = m_dev->getMpdStatusNoUpdate();
226
    const MpdStatus &mpds = m_dev->getMpdStatusNoUpdate();
227
227
228
    st["TransportState"] =  mpdstatusToTransportState(mpds.state);
228
    st["TransportState"] =  mpdstatusToTransportState(mpds.state);
229
    st["Repeat"] = SoapHelp::i2s(mpds.rept);
229
    st["Repeat"] = SoapHelp::i2s(mpds.rept);
230
    st["Shuffle"] = SoapHelp::i2s(mpds.random);
230
    st["Shuffle"] = SoapHelp::i2s(mpds.random);
231
    st["Id"] = SoapHelp::i2s(mpds.songid);
231
    st["Id"] = mpds.songid == -1 ? "0" : SoapHelp::i2s(mpds.songid);
232
    st["TracksMax"] = SoapHelp::i2s(tracksmax);
232
    st["TracksMax"] = SoapHelp::i2s(tracksmax);
233
    st["ProtocolInfo"] = upmpdProtocolInfo;
233
    st["ProtocolInfo"] = upmpdProtocolInfo;
234
    makeIdArray(st["IdArray"]);
234
    makeIdArray(st["IdArray"]);
235
235
236
    return true;
236
    return true;
...
...
429
// Return current Id
429
// Return current Id
430
int OHPlaylist::id(const SoapArgs& sc, SoapData& data)
430
int OHPlaylist::id(const SoapArgs& sc, SoapData& data)
431
{
431
{
432
    LOGDEB("OHPlaylist::id" << endl);
432
    LOGDEB("OHPlaylist::id" << endl);
433
    const MpdStatus &mpds = m_dev->getMpdStatusNoUpdate();
433
    const MpdStatus &mpds = m_dev->getMpdStatusNoUpdate();
434
    data.addarg("Value", SoapHelp::i2s(mpds.songid));
434
    data.addarg("Value", mpds.songid == -1 ? "0" : SoapHelp::i2s(mpds.songid));
435
    return UPNP_E_SUCCESS;
435
    return UPNP_E_SUCCESS;
436
}
436
}
437
437
438
bool OHPlaylist::cacheFind(const string& uri, string& meta)
438
bool OHPlaylist::cacheFind(const string& uri, string& meta)
439
{
439
{