Switch to unified view

a/src/ohplaylist.hxx b/src/ohplaylist.hxx
...
...
20
#include <string>                       // for string
20
#include <string>                       // for string
21
#include <unordered_map>                // for unordered_map
21
#include <unordered_map>                // for unordered_map
22
#include <vector>                       // for vector
22
#include <vector>                       // for vector
23
23
24
#include "libupnpp/device/device.hxx"   // for UpnpService
24
#include "libupnpp/device/device.hxx"   // for UpnpService
25
#include "libupnpp/soaphelp.hxx"        // for SoapArgs, SoapData
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;
29
class UpMpdRenderCtl;
30
30
...
...
45
    virtual bool ireadList(const std::vector<int>&, std::vector<UpSong>&);
45
    virtual bool ireadList(const std::vector<int>&, std::vector<UpSong>&);
46
    virtual bool iidArray(std::string& idarray, int *token);
46
    virtual bool iidArray(std::string& idarray, int *token);
47
    virtual bool urlMap(std::unordered_map<int, std::string>& umap);
47
    virtual bool urlMap(std::unordered_map<int, std::string>& umap);
48
48
49
private:
49
private:
50
    int play(const SoapArgs& sc, SoapData& data);
50
    int play(const SoapIncoming& sc, SoapOutgoing& data);
51
    int pause(const SoapArgs& sc, SoapData& data);
51
    int pause(const SoapIncoming& sc, SoapOutgoing& data);
52
    int stop(const SoapArgs& sc, SoapData& data);
52
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
53
    int next(const SoapArgs& sc, SoapData& data);
53
    int next(const SoapIncoming& sc, SoapOutgoing& data);
54
    int previous(const SoapArgs& sc, SoapData& data);
54
    int previous(const SoapIncoming& sc, SoapOutgoing& data);
55
    int setRepeat(const SoapArgs& sc, SoapData& data);
55
    int setRepeat(const SoapIncoming& sc, SoapOutgoing& data);
56
    int repeat(const SoapArgs& sc, SoapData& data);
56
    int repeat(const SoapIncoming& sc, SoapOutgoing& data);
57
    int setShuffle(const SoapArgs& sc, SoapData& data);
57
    int setShuffle(const SoapIncoming& sc, SoapOutgoing& data);
58
    int shuffle(const SoapArgs& sc, SoapData& data);
58
    int shuffle(const SoapIncoming& sc, SoapOutgoing& data);
59
    int seekSecondAbsolute(const SoapArgs& sc, SoapData& data);
59
    int seekSecondAbsolute(const SoapIncoming& sc, SoapOutgoing& data);
60
    int seekSecondRelative(const SoapArgs& sc, SoapData& data);
60
    int seekSecondRelative(const SoapIncoming& sc, SoapOutgoing& data);
61
    int seekId(const SoapArgs& sc, SoapData& data);
61
    int seekId(const SoapIncoming& sc, SoapOutgoing& data);
62
    int seekIndex(const SoapArgs& sc, SoapData& data);
62
    int seekIndex(const SoapIncoming& sc, SoapOutgoing& data);
63
    int transportState(const SoapArgs& sc, SoapData& data);
63
    int transportState(const SoapIncoming& sc, SoapOutgoing& data);
64
    int id(const SoapArgs& sc, SoapData& data);
64
    int id(const SoapIncoming& sc, SoapOutgoing& data);
65
    int ohread(const SoapArgs& sc, SoapData& data);
65
    int ohread(const SoapIncoming& sc, SoapOutgoing& data);
66
    int readList(const SoapArgs& sc, SoapData& data);
66
    int readList(const SoapIncoming& sc, SoapOutgoing& data);
67
    int insert(const SoapArgs& sc, SoapData& data);
67
    int insert(const SoapIncoming& sc, SoapOutgoing& data);
68
    int deleteId(const SoapArgs& sc, SoapData& data);
68
    int deleteId(const SoapIncoming& sc, SoapOutgoing& data);
69
    int deleteAll(const SoapArgs& sc, SoapData& data);
69
    int deleteAll(const SoapIncoming& sc, SoapOutgoing& data);
70
    int tracksMax(const SoapArgs& sc, SoapData& data);
70
    int tracksMax(const SoapIncoming& sc, SoapOutgoing& data);
71
    int idArray(const SoapArgs& sc, SoapData& data);
71
    int idArray(const SoapIncoming& sc, SoapOutgoing& data);
72
    int idArrayChanged(const SoapArgs& sc, SoapData& data);
72
    int idArrayChanged(const SoapIncoming& sc, SoapOutgoing& data);
73
    int protocolInfo(const SoapArgs& sc, SoapData& data);
73
    int protocolInfo(const SoapIncoming& sc, SoapOutgoing& data);
74
74
75
    bool makeIdArray(std::string&);
75
    bool makeIdArray(std::string&);
76
    bool makestate(std::unordered_map<std::string, std::string> &st);
76
    bool makestate(std::unordered_map<std::string, std::string> &st);
77
    void maybeWakeUp(bool ok);
77
    void maybeWakeUp(bool ok);
78
    // State variable storage
78
    // State variable storage