Switch to unified view

a/upmpd/mpdcli.hxx b/upmpd/mpdcli.hxx
...
...
19
19
20
#include <unordered_map>
20
#include <unordered_map>
21
#include <string>
21
#include <string>
22
#include <map>
22
#include <map>
23
#include <vector>
23
#include <vector>
24
25
#include <regex.h>
24
26
25
class UpSong {
27
class UpSong {
26
public:
28
public:
27
    UpSong() : duration_secs(0), mpdid(0) {}
29
    UpSong() : duration_secs(0), mpdid(0) {}
28
    void clear() {
30
    void clear() {
...
...
127
    // volume in the status)
129
    // volume in the status)
128
    int m_cachedvolume; 
130
    int m_cachedvolume; 
129
    std::string m_host;
131
    std::string m_host;
130
    int m_port;
132
    int m_port;
131
    std::string m_password;
133
    std::string m_password;
134
    regex_t m_tpuexpr;
132
135
133
    bool openconn();
136
    bool openconn();
134
    bool updStatus();
137
    bool updStatus();
135
    bool getQueueSongs(std::vector<mpd_song*>& songs);
138
    bool getQueueSongs(std::vector<mpd_song*>& songs);
136
    void freeSongs(std::vector<mpd_song*>& songs);
139
    void freeSongs(std::vector<mpd_song*>& songs);
137
    bool showError(const std::string& who);
140
    bool showError(const std::string& who);
141
    bool looksLikeTransportURI(const std::string& path);
138
};
142
};
139
143
140
144
141
#endif /* _MPDCLI_H_X_INCLUDED_ */
145
#endif /* _MPDCLI_H_X_INCLUDED_ */