Switch to unified view

a/src/mpdcli.hxx b/src/mpdcli.hxx
...
...
53
    }
53
    }
54
};
54
};
55
55
56
class MpdStatus {
56
class MpdStatus {
57
public:
57
public:
58
    MpdStatus() : trackcounter(0), detailscounter(0),
58
    MpdStatus() : trackcounter(0), detailscounter(0) {}
59
                  externalvolumecontrol(false) {}
60
59
61
    enum State {MPDS_UNK, MPDS_STOP, MPDS_PLAY, MPDS_PAUSE};
60
    enum State {MPDS_UNK, MPDS_STOP, MPDS_PLAY, MPDS_PAUSE};
62
61
63
    int volume;
62
    int volume;
64
    bool rept;
63
    bool rept;
...
...
84
    UpSong nextsong;
83
    UpSong nextsong;
85
84
86
    // Synthetized fields
85
    // Synthetized fields
87
    int trackcounter;
86
    int trackcounter;
88
    int detailscounter;
87
    int detailscounter;
89
    bool externalvolumecontrol;
90
    std::string onvolumechange;
91
    std::string getexternalvolume;
92
};
88
};
93
89
94
// Complete Mpd State
90
// Complete Mpd State
95
struct MpdState {
91
struct MpdState {
96
    MpdStatus status;
92
    MpdStatus status;
...
...
154
    int m_port;
150
    int m_port;
155
    std::string m_password;
151
    std::string m_password;
156
    std::string m_onstart;
152
    std::string m_onstart;
157
    std::string m_onplay;
153
    std::string m_onplay;
158
    std::string m_onstop;
154
    std::string m_onstop;
155
    bool m_externalvolumecontrol;
156
    std::string m_onvolumechange;
157
    std::string m_getexternalvolume;
159
    regex_t m_tpuexpr;
158
    regex_t m_tpuexpr;
160
    // addtagid command only exists for mpd 0.19 and later.
159
    // addtagid command only exists for mpd 0.19 and later.
161
    bool m_have_addtagid; 
160
    bool m_have_addtagid; 
162
    // Position and id of last insertion: if the new request is to
161
    // Position and id of last insertion: if the new request is to
163
    // insert after this id, and the queue did not change, we compute
162
    // insert after this id, and the queue did not change, we compute