Switch to unified view

a/src/ohplaylist.hxx b/src/ohplaylist.hxx
...
...
24
#include "libupnpp/device/device.hxx"   // for UpnpService
24
#include "libupnpp/device/device.hxx"   // for UpnpService
25
#include "libupnpp/soaphelp.hxx"        // for SoapIncoming, SoapOutgoing
25
#include "libupnpp/soaphelp.hxx"        // for SoapIncoming, SoapOutgoing
26
#include "mpdcli.hxx"
26
#include "mpdcli.hxx"
27
27
28
class UpMpd;
28
class UpMpd;
29
class UpMpdRenderCtl;
30
29
31
using namespace UPnPP;
30
using namespace UPnPP;
32
31
33
class OHPlaylist : public UPnPProvider::UpnpService {
32
class OHPlaylist : public UPnPProvider::UpnpService {
34
public:
33
public:
35
    OHPlaylist(UpMpd *dev, UpMpdRenderCtl *ctl, unsigned int cachesavesleep);
34
    OHPlaylist(UpMpd *dev, unsigned int cachesavesleep);
36
35
37
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
36
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
38
                              std::vector<std::string>& values);
37
                              std::vector<std::string>& values);
39
    virtual bool cacheFind(const std::string& uri, std:: string& meta);
38
    bool cacheFind(const std::string& uri, std:: string& meta);
40
39
41
    // Internal non-soap versions of some of the interface for use by
40
    // Internal non-soap versions of some of the interface for use by
42
    // e.g. ohreceiver
41
    // e.g. ohreceiver
43
    virtual bool insertUri(int afterid, const std::string& uri, 
42
    bool insertUri(int afterid, const std::string& uri, 
44
                           const std::string& metadata, int *newid = 0);
43
                   const std::string& metadata, int *newid = 0);
45
    virtual bool ireadList(const std::vector<int>&, std::vector<UpSong>&);
44
    bool ireadList(const std::vector<int>&, std::vector<UpSong>&);
46
    virtual bool iidArray(std::string& idarray, int *token);
45
    bool iidArray(std::string& idarray, int *token);
47
    virtual bool urlMap(std::unordered_map<int, std::string>& umap);
46
    bool urlMap(std::unordered_map<int, std::string>& umap);
48
47
48
    int iStop();
49
    void resetQVers();
50
    
49
private:
51
private:
50
    int play(const SoapIncoming& sc, SoapOutgoing& data);
52
    int play(const SoapIncoming& sc, SoapOutgoing& data);
51
    int pause(const SoapIncoming& sc, SoapOutgoing& data);
53
    int pause(const SoapIncoming& sc, SoapOutgoing& data);
52
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
54
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
53
    int next(const SoapIncoming& sc, SoapOutgoing& data);
55
    int next(const SoapIncoming& sc, SoapOutgoing& data);