Switch to unified view

a/libupnpp/control/cdirectory.cxx b/libupnpp/control/cdirectory.cxx
...
...
25
#include <vector>
25
#include <vector>
26
using namespace std;
26
using namespace std;
27
#include <functional>
27
#include <functional>
28
using namespace std::placeholders;
28
using namespace std::placeholders;
29
29
30
#include "upnpp_p.hxx"
31
30
32
#include <upnp/upnp.h>
31
#include <upnp/upnp.h>
33
#include <upnp/upnptools.h>
32
#include <upnp/upnptools.h>
34
33
34
#include "libupnpp/upnpp_p.hxx"
35
#include "upnpplib.hxx"
35
#include "libupnpp/upnpplib.hxx"
36
#include "ixmlwrap.hxx"
36
#include "libupnpp/ixmlwrap.hxx"
37
#include "cdirectory.hxx"
37
#include "libupnpp/control/cdirectory.hxx"
38
#include "cdircontent.hxx"
38
#include "libupnpp/control/cdircontent.hxx"
39
#include "discovery.hxx"
39
#include "libupnpp/discovery.hxx"
40
#include "soaphelp.hxx"
40
#include "libupnpp/soaphelp.hxx"
41
#include "log.hxx"
41
#include "libupnpp/log.hxx"
42
42
43
namespace UPnPClient {
43
namespace UPnPClient {
44
44
45
// The service type string for Content Directories:
45
// The service type string for Content Directories:
46
const string ContentDirectoryService::SType("urn:schemas-upnp-org:service:ContentDirectory:1");
46
const string ContentDirectoryService::SType("urn:schemas-upnp-org:service:ContentDirectory:1");
...
...
133
    SoapData args(m_serviceType, "Browse");
133
    SoapData args(m_serviceType, "Browse");
134
    args("ObjectID", objectId)
134
    args("ObjectID", objectId)
135
        ("BrowseFlag", "BrowseDirectChildren")
135
        ("BrowseFlag", "BrowseDirectChildren")
136
        ("Filter", "*")
136
        ("Filter", "*")
137
        ("SortCriteria", "")
137
        ("SortCriteria", "")
138
        ("StartingIndex", SoapEncodeInput::i2s(offset))
138
        ("StartingIndex", SoapHelp::i2s(offset))
139
        ("RequestedCount", SoapEncodeInput::i2s(count));
139
        ("RequestedCount", SoapHelp::i2s(count));
140
140
141
    SoapArgs data;
141
    SoapArgs data;
142
    int ret = runAction(args, data);
142
    int ret = runAction(args, data);
143
    if (ret != UPNP_E_SUCCESS) {
143
    if (ret != UPNP_E_SUCCESS) {
144
        return ret;
144
        return ret;
...
...
209
        SoapData args(m_serviceType, "Search");
209
        SoapData args(m_serviceType, "Search");
210
        args("ContainerID", objectId)
210
        args("ContainerID", objectId)
211
            ("SearchCriteria", ss)
211
            ("SearchCriteria", ss)
212
            ("Filter", "*")
212
            ("Filter", "*")
213
            ("SortCriteria", "")
213
            ("SortCriteria", "")
214
            ("StartingIndex", SoapEncodeInput::i2s(offset))
214
            ("StartingIndex", SoapHelp::i2s(offset))
215
            ("RequestedCount", "10"); 
215
            ("RequestedCount", "10"); 
216
216
217
        SoapArgs data;
217
        SoapArgs data;
218
        int ret = runAction(args, data);
218
        int ret = runAction(args, data);
219
219