Switch to unified view

a/src/ohplaylist.hxx b/src/ohplaylist.hxx
...
...
45
    bool iidArray(std::string& idarray, int *token);
45
    bool iidArray(std::string& idarray, int *token);
46
    bool urlMap(std::unordered_map<int, std::string>& umap);
46
    bool urlMap(std::unordered_map<int, std::string>& umap);
47
47
48
    int iStop();
48
    int iStop();
49
    void refreshState();
49
    void refreshState();
50
51
    // Source active ?
52
    void setActive(bool onoff) {
53
        m_active = onoff;
54
    }
50
    
55
    
51
private:
56
private:
52
    int play(const SoapIncoming& sc, SoapOutgoing& data);
57
    int play(const SoapIncoming& sc, SoapOutgoing& data);
53
    int pause(const SoapIncoming& sc, SoapOutgoing& data);
58
    int pause(const SoapIncoming& sc, SoapOutgoing& data);
54
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
59
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
...
...
75
    int protocolInfo(const SoapIncoming& sc, SoapOutgoing& data);
80
    int protocolInfo(const SoapIncoming& sc, SoapOutgoing& data);
76
81
77
    bool makeIdArray(std::string&);
82
    bool makeIdArray(std::string&);
78
    bool makestate(std::unordered_map<std::string, std::string> &st);
83
    bool makestate(std::unordered_map<std::string, std::string> &st);
79
    void maybeWakeUp(bool ok);
84
    void maybeWakeUp(bool ok);
85
80
    // State variable storage
86
    // State variable storage
81
    std::unordered_map<std::string, std::string> m_state;
87
    std::unordered_map<std::string, std::string> m_state;
82
    UpMpd *m_dev;
88
    UpMpd *m_dev;
83
89
90
    bool m_active;
91
    
84
    // Storage for song metadata, indexed by URL.  This used to be
92
    // Storage for song metadata, indexed by URL.  This used to be
85
    // indexed by song id, but this does not survive MPD restarts.
93
    // indexed by song id, but this does not survive MPD restarts.
86
    // The data is the DIDL XML string.
94
    // The data is the DIDL XML string.
87
    std::unordered_map<std::string, std::string> m_metacache;
95
    std::unordered_map<std::string, std::string> m_metacache;
88
    bool m_cachedirty;
96
    bool m_cachedirty;