Switch to unified view

a/src/ohradio.cxx b/src/ohradio.cxx
...
...
39
#include "upmpdutils.hxx"
39
#include "upmpdutils.hxx"
40
#include "conftree.h"
40
#include "conftree.h"
41
#include "execmd.h"
41
#include "execmd.h"
42
#include "ohproduct.hxx"
42
#include "ohproduct.hxx"
43
#include "ohinfo.hxx"
43
#include "ohinfo.hxx"
44
#include "protocolinfo.hxx"
44
45
45
using namespace std;
46
using namespace std;
46
using namespace std::placeholders;
47
using namespace std::placeholders;
47
48
48
static const string sTpProduct("urn:av-openhome-org:service:Radio:1");
49
static const string sTpProduct("urn:av-openhome-org:service:Radio:1");
...
...
232
        if (m_active) 
233
        if (m_active) 
233
            LOGDEB("OHRadio::makestate: bad m_id " << m_id << endl);
234
            LOGDEB("OHRadio::makestate: bad m_id " << m_id << endl);
234
        st["Metadata"] =  "";
235
        st["Metadata"] =  "";
235
        m_dev->m_ohif->setMetatext("");
236
        m_dev->m_ohif->setMetatext("");
236
    }
237
    }
237
    st["ProtocolInfo"] = g_protocolInfo;
238
    st["ProtocolInfo"] = Protocolinfo::the()->gettext();
238
    st["TransportState"] =  mpdstatusToTransportState(mpds.state);
239
    st["TransportState"] =  mpdstatusToTransportState(mpds.state);
239
    st["Uri"] = mpds.currentsong.uri;
240
    st["Uri"] = mpds.currentsong.uri;
240
    return true;
241
    return true;
241
}
242
}
242
243
...
...
586
}
587
}
587
588
588
int OHRadio::protocolInfo(const SoapIncoming& sc, SoapOutgoing& data)
589
int OHRadio::protocolInfo(const SoapIncoming& sc, SoapOutgoing& data)
589
{
590
{
590
    LOGDEB("OHRadio::protocolInfo" << endl);
591
    LOGDEB("OHRadio::protocolInfo" << endl);
591
    data.addarg("Value", g_protocolInfo);
592
    data.addarg("Value", Protocolinfo::the()->gettext());
592
    return UPNP_E_SUCCESS;
593
    return UPNP_E_SUCCESS;
593
}
594
}