Switch to unified view

a/src/contentdirectory.hxx b/src/contentdirectory.hxx
...
...
21
#include <vector>
21
#include <vector>
22
22
23
#include "libupnpp/device/device.hxx"
23
#include "libupnpp/device/device.hxx"
24
#include "libupnpp/soaphelp.hxx"
24
#include "libupnpp/soaphelp.hxx"
25
25
26
#include "cdplugins/cdplugin.hxx"
26
#include "cdplugin.hxx"
27
27
28
using namespace UPnPP;
28
using namespace UPnPP;
29
29
30
class ContentDirectory : public UPnPProvider::UpnpService,
30
class ContentDirectory : public UPnPProvider::UpnpService,
31
                         public CDPluginServices {
31
                         public CDPluginServices {
...
...
33
    ContentDirectory(UPnPProvider::UpnpDevice *dev);
33
    ContentDirectory(UPnPProvider::UpnpDevice *dev);
34
    ~ContentDirectory();
34
    ~ContentDirectory();
35
35
36
    /// Returns something like "/tidal" (no end slash)
36
    /// Returns something like "/tidal" (no end slash)
37
    virtual std::string getpathprefix(CDPlugin *);
37
    virtual std::string getpathprefix(CDPlugin *);
38
    /// Return plugin based on path prefix
39
    CDPlugin *getpluginforpath(const std::string& path);
38
40
39
    /// Retrieve the IP address and port for the libupnp server. URLs
41
    /// Retrieve the IP address and port for the libupnp server. URLs
40
    /// intended to be served this way (by adding a vdir) should use
42
    /// intended to be served this way (by adding a vdir) should use
41
    /// these as host/port
43
    /// these as host/port
42
    virtual std::string getupnpaddr(CDPlugin *);
44
    virtual std::string getupnpaddr(CDPlugin *);
...
...
47
    virtual bool setfileops(CDPlugin *, const std::string& path,
49
    virtual bool setfileops(CDPlugin *, const std::string& path,
48
                            UPnPProvider::VirtualDir::FileOps ops);
50
                            UPnPProvider::VirtualDir::FileOps ops);
49
51
50
    /// Access the main configuration file.
52
    /// Access the main configuration file.
51
    virtual ConfSimple *getconfig(CDPlugin *);
53
    virtual ConfSimple *getconfig(CDPlugin *);
52
    virtual const std::vector<std::string> getexecpath(CDPlugin *);
54
    virtual std::string getexecpath(CDPlugin *);
53
55
54
private:
56
private:
55
    int actGetSearchCapabilities(const SoapIncoming& sc, SoapOutgoing& data);
57
    int actGetSearchCapabilities(const SoapIncoming& sc, SoapOutgoing& data);
56
    int actGetSortCapabilities(const SoapIncoming& sc, SoapOutgoing& data);
58
    int actGetSortCapabilities(const SoapIncoming& sc, SoapOutgoing& data);
57
    int actGetSystemUpdateID(const SoapIncoming& sc, SoapOutgoing& data);
59
    int actGetSystemUpdateID(const SoapIncoming& sc, SoapOutgoing& data);