Switch to unified view

a/upmpd/avtransport.hxx b/upmpd/avtransport.hxx
...
...
20
#include <string>
20
#include <string>
21
21
22
#include "libupnpp/device.hxx"
22
#include "libupnpp/device.hxx"
23
23
24
class UpMpd;
24
class UpMpd;
25
class OHPlaylist;
25
26
26
class UpMpdAVTransport : public UpnpService {
27
class UpMpdAVTransport : public UpnpService {
27
public:
28
public:
28
    UpMpdAVTransport(UpMpd *dev);
29
    UpMpdAVTransport(UpMpd *dev);
29
30
30
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
31
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
31
                              std::vector<std::string>& values);
32
                              std::vector<std::string>& values);
33
34
    void setOHP(OHPlaylist *ohp) 
35
    {
36
        m_ohp = ohp;
37
    }
32
38
33
private:
39
private:
34
    int setAVTransportURI(const SoapArgs& sc, SoapData& data, bool setnext);
40
    int setAVTransportURI(const SoapArgs& sc, SoapData& data, bool setnext);
35
    int getPositionInfo(const SoapArgs& sc, SoapData& data);
41
    int getPositionInfo(const SoapArgs& sc, SoapData& data);
36
    int getTransportInfo(const SoapArgs& sc, SoapData& data);
42
    int getTransportInfo(const SoapArgs& sc, SoapData& data);
...
...
44
    int seqcontrol(const SoapArgs& sc, SoapData& data, int what);
50
    int seqcontrol(const SoapArgs& sc, SoapData& data, int what);
45
    // Translate MPD state to AVTransport state variables.
51
    // Translate MPD state to AVTransport state variables.
46
    bool tpstateMToU(unordered_map<string, string>& state);
52
    bool tpstateMToU(unordered_map<string, string>& state);
47
53
48
    UpMpd *m_dev;
54
    UpMpd *m_dev;
55
    OHPlaylist *m_ohp;
56
49
    // State variable storage
57
    // State variable storage
50
    unordered_map<string, string> m_tpstate;
58
    unordered_map<string, string> m_tpstate;
59
    string m_uri;
51
    string m_curMetadata;
60
    string m_curMetadata;
52
    string m_nextUri;
61
    string m_nextUri;
53
    string m_nextMetadata;
62
    string m_nextMetadata;
54
    // My track identifiers (for cleaning up)
63
    // My track identifiers (for cleaning up)
55
    set<int> m_songids;
64
    set<int> m_songids;