Switch to unified view

a/upmpd/avtransport.cxx b/upmpd/avtransport.cxx
...
...
255
        }
255
        }
256
256
257
        chgdata += "<";
257
        chgdata += "<";
258
        chgdata += it->first;
258
        chgdata += it->first;
259
        chgdata += " val=\"";
259
        chgdata += " val=\"";
260
        chgdata += xmlquote(it->second);
260
        chgdata += SoapArgs::xmlQuote(it->second);
261
        chgdata += "\"/>\n";
261
        chgdata += "\"/>\n";
262
    }
262
    }
263
    chgdata += "</InstanceID>\n</Event>\n";
263
    chgdata += "</InstanceID>\n</Event>\n";
264
264
265
    if (!changefound) {
265
    if (!changefound) {
...
...
408
        data.addarg("TrackMetaData", "");
408
        data.addarg("TrackMetaData", "");
409
    }
409
    }
410
410
411
    const string& uri = mpds.currentsong.uri;
411
    const string& uri = mpds.currentsong.uri;
412
    if (is_song && !uri.empty()) {
412
    if (is_song && !uri.empty()) {
413
        data.addarg("TrackURI", xmlquote(uri));
413
        data.addarg("TrackURI", SoapArgs::xmlQuote(uri));
414
    } else {
414
    } else {
415
        data.addarg("TrackURI", "");
415
        data.addarg("TrackURI", "");
416
    }
416
    }
417
    if (is_song) {
417
    if (is_song) {
418
        data.addarg("RelTime", upnpduration(mpds.songelapsedms));
418
        data.addarg("RelTime", upnpduration(mpds.songelapsedms));
...
...
472
        data.addarg("MediaDuration", "00:00:00");
472
        data.addarg("MediaDuration", "00:00:00");
473
    }
473
    }
474
474
475
    const string& thisuri = mpds.currentsong.uri;
475
    const string& thisuri = mpds.currentsong.uri;
476
    if (is_song && !thisuri.empty()) {
476
    if (is_song && !thisuri.empty()) {
477
        data.addarg("CurrentURI", xmlquote(thisuri));
477
        data.addarg("CurrentURI", SoapArgs::xmlQuote(thisuri));
478
    } else {
478
    } else {
479
        data.addarg("CurrentURI", "");
479
        data.addarg("CurrentURI", "");
480
    }
480
    }
481
    if (is_song) {
481
    if (is_song) {
482
        if ((m_dev->m_options & UpMpd::upmpdOwnQueue)) {
482
        if ((m_dev->m_options & UpMpd::upmpdOwnQueue)) {