Switch to unified view

a/src/ohinfo.cxx b/src/ohinfo.cxx
...
...
25
#include <unordered_map>                // for unordered_map, etc
25
#include <unordered_map>                // for unordered_map, etc
26
#include <utility>                      // for pair
26
#include <utility>                      // for pair
27
#include <vector>                       // for vector
27
#include <vector>                       // for vector
28
28
29
#include "libupnpp/log.hxx"             // for LOGDEB
29
#include "libupnpp/log.hxx"             // for LOGDEB
30
#include "libupnpp/soaphelp.hxx"        // for SoapData, i2s, SoapArgs
30
#include "libupnpp/soaphelp.hxx"        // for SoapOutgoing, i2s, SoapIncoming
31
31
32
#include "mpdcli.hxx"                   // for MpdStatus, etc
32
#include "mpdcli.hxx"                   // for MpdStatus, etc
33
#include "upmpd.hxx"                    // for UpMpd
33
#include "upmpd.hxx"                    // for UpMpd
34
#include "upmpdutils.hxx"               // for didlmake, diffmaps
34
#include "upmpdutils.hxx"               // for didlmake, diffmaps
35
35
...
...
125
    }
125
    }
126
126
127
    return true;
127
    return true;
128
}
128
}
129
129
130
int OHInfo::counters(const SoapArgs& sc, SoapData& data)
130
int OHInfo::counters(const SoapIncoming& sc, SoapOutgoing& data)
131
{
131
{
132
    LOGDEB("OHInfo::counters" << endl);
132
    LOGDEB("OHInfo::counters" << endl);
133
    
133
    
134
    data.addarg("TrackCount", SoapHelp::i2s(m_dev->m_mpds ?
134
    data.addarg("TrackCount", SoapHelp::i2s(m_dev->m_mpds ?
135
                                            m_dev->m_mpds->trackcounter : 0));
135
                                            m_dev->m_mpds->trackcounter : 0));
...
...
137
                                              m_dev->m_mpds->detailscounter:0));
137
                                              m_dev->m_mpds->detailscounter:0));
138
    data.addarg("MetatextCount", "0");
138
    data.addarg("MetatextCount", "0");
139
    return UPNP_E_SUCCESS;
139
    return UPNP_E_SUCCESS;
140
}
140
}
141
141
142
int OHInfo::track(const SoapArgs& sc, SoapData& data)
142
int OHInfo::track(const SoapIncoming& sc, SoapOutgoing& data)
143
{
143
{
144
    LOGDEB("OHInfo::track" << endl);
144
    LOGDEB("OHInfo::track" << endl);
145
145
146
    string uri, metadata;
146
    string uri, metadata;
147
    urimetadata(uri, metadata);
147
    urimetadata(uri, metadata);
148
    data.addarg("Uri", uri);
148
    data.addarg("Uri", uri);
149
    data.addarg("Metadata", metadata);
149
    data.addarg("Metadata", metadata);
150
    return UPNP_E_SUCCESS;
150
    return UPNP_E_SUCCESS;
151
}
151
}
152
152
153
int OHInfo::details(const SoapArgs& sc, SoapData& data)
153
int OHInfo::details(const SoapIncoming& sc, SoapOutgoing& data)
154
{
154
{
155
    LOGDEB("OHInfo::details" << endl);
155
    LOGDEB("OHInfo::details" << endl);
156
156
157
    string duration, bitrate, bitdepth, samplerate;
157
    string duration, bitrate, bitdepth, samplerate;
158
    makedetails(duration, bitrate, bitdepth, samplerate);
158
    makedetails(duration, bitrate, bitdepth, samplerate);
...
...
163
    data.addarg("Lossless", "0");
163
    data.addarg("Lossless", "0");
164
    data.addarg("CodecName", "");
164
    data.addarg("CodecName", "");
165
    return UPNP_E_SUCCESS;
165
    return UPNP_E_SUCCESS;
166
}
166
}
167
167
168
int OHInfo::metatext(const SoapArgs& sc, SoapData& data)
168
int OHInfo::metatext(const SoapIncoming& sc, SoapOutgoing& data)
169
{
169
{
170
    LOGDEB("OHInfo::metatext" << endl);
170
    LOGDEB("OHInfo::metatext" << endl);
171
    data.addarg("Value", "");
171
    data.addarg("Value", "");
172
    return UPNP_E_SUCCESS;
172
    return UPNP_E_SUCCESS;
173
}
173
}