Switch to unified view

a/src/conman.cxx b/src/conman.cxx
...
...
25
#include <string>                       // for string, basic_string
25
#include <string>                       // for string, basic_string
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, SoapArgs
30
#include "libupnpp/soaphelp.hxx"        // for SoapOutgoing, SoapIncoming
31
31
32
#include "upmpd.hxx"                    // for UpMpd
32
#include "upmpd.hxx"                    // for UpMpd
33
33
34
using namespace std;
34
using namespace std;
35
using namespace std::placeholders;
35
using namespace std::placeholders;
...
...
63
        values.push_back(upmpdProtocolInfo);
63
        values.push_back(upmpdProtocolInfo);
64
    }
64
    }
65
    return true;
65
    return true;
66
}
66
}
67
67
68
int UpMpdConMan::getCurrentConnectionIDs(const SoapArgs& sc, SoapData& data)
68
int UpMpdConMan::getCurrentConnectionIDs(const SoapIncoming& sc, SoapOutgoing& data)
69
{
69
{
70
    LOGDEB("UpMpd:getCurrentConnectionIDs" << endl);
70
    LOGDEB("UpMpd:getCurrentConnectionIDs" << endl);
71
    data.addarg("ConnectionIDs", "0");
71
    data.addarg("ConnectionIDs", "0");
72
    return UPNP_E_SUCCESS;
72
    return UPNP_E_SUCCESS;
73
}
73
}
74
74
75
int UpMpdConMan::getCurrentConnectionInfo(const SoapArgs& sc, SoapData& data)
75
int UpMpdConMan::getCurrentConnectionInfo(const SoapIncoming& sc, SoapOutgoing& data)
76
{
76
{
77
    LOGDEB("UpMpdConMan:getCurrentConnectionInfo" << endl);
77
    LOGDEB("UpMpdConMan:getCurrentConnectionInfo" << endl);
78
    map<string, string>::const_iterator it;
78
79
    it = sc.args.find("ConnectionID");
79
    string conid;
80
    if (it == sc.args.end() || it->second.empty()) {
80
    if (!sc.get("ConnectionID", &conid) || conid.compare("0")) {
81
        return UPNP_E_INVALID_PARAM;
82
    }
83
    if (it->second.compare("0")) {
84
        return UPNP_E_INVALID_PARAM;
81
        return UPNP_E_INVALID_PARAM;
85
    }
82
    }
86
83
87
    data.addarg("RcsID", "0");
84
    data.addarg("RcsID", "0");
88
    data.addarg("AVTransportID", "0");
85
    data.addarg("AVTransportID", "0");
...
...
93
    data.addarg("Status", "Unknown");
90
    data.addarg("Status", "Unknown");
94
91
95
    return UPNP_E_SUCCESS;
92
    return UPNP_E_SUCCESS;
96
}
93
}
97
94
98
int UpMpdConMan::getProtocolInfo(const SoapArgs& sc, SoapData& data)
95
int UpMpdConMan::getProtocolInfo(const SoapIncoming& sc, SoapOutgoing& data)
99
{
96
{
100
    LOGDEB("UpMpdConMan::getProtocolInfo" << endl);
97
    LOGDEB("UpMpdConMan::getProtocolInfo" << endl);
101
    data.addarg("Source", "");
98
    data.addarg("Source", "");
102
    data.addarg("Sink", upmpdProtocolInfo);
99
    data.addarg("Sink", upmpdProtocolInfo);
103
100