Switch to unified view

a/upmpd/upmpd.hxx b/upmpd/upmpd.hxx
...
...
16
 */
16
 */
17
17
18
#ifndef _UPMPD_H_X_INCLUDED_
18
#ifndef _UPMPD_H_X_INCLUDED_
19
#define _UPMPD_H_X_INCLUDED_
19
#define _UPMPD_H_X_INCLUDED_
20
20
21
using namespace UPnPProvider;
21
#include <string>                       // for string
22
#include <unordered_map>                // for unordered_map
23
#include <vector>                       // for vector
24
25
#include "libupnpp/device/device.hxx"   // for UpnpDevice, etc
22
26
23
class MPDCli;
27
class MPDCli;
24
class MpdStatus;
28
class MpdStatus;
29
30
using namespace UPnPProvider;
25
31
26
// The UPnP MPD frontend device with its 3 services
32
// The UPnP MPD frontend device with its 3 services
27
class UpMpd : public UpnpDevice {
33
class UpMpd : public UpnpDevice {
28
public:
34
public:
29
    friend class UpMpdRenderCtl;
35
    friend class UpMpdRenderCtl;
...
...
40
        upmpdDoOH = 2,
46
        upmpdDoOH = 2,
41
        // Save queue metadata to disk for persistence across restarts
47
        // Save queue metadata to disk for persistence across restarts
42
        // (mpd does it)
48
        // (mpd does it)
43
        upmpdOhMetaPersist = 4
49
        upmpdOhMetaPersist = 4
44
    };
50
    };
45
    UpMpd(const string& deviceid, const string& friendlyname,
51
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
46
          const unordered_map<string, string>& xmlfiles,
52
          const std::unordered_map<std::string, std::string>& xmlfiles,
47
          MPDCli *mpdcli, unsigned int opts, const std::string& cachefn);
53
          MPDCli *mpdcli, unsigned int opts, const std::string& cachefn);
48
    ~UpMpd();
54
    ~UpMpd();
49
55
50
    const MpdStatus &getMpdStatus();
56
    const MpdStatus &getMpdStatus();
51
    const MpdStatus &getMpdStatusNoUpdate()
57
    const MpdStatus &getMpdStatusNoUpdate()
52
        {
58
        {
53
            return *m_mpds;
59
            return *m_mpds;
54
        }
60
        }
55
61
56
    const string& getMetaCacheFn() 
62
    const std::string& getMetaCacheFn()
57
        {
63
        {
58
            return m_mcachefn;
64
            return m_mcachefn;
59
        }
65
        }
60
66
61
private:
67
private:
62
    MPDCli *m_mpdcli;
68
    MPDCli *m_mpdcli;
63
    const MpdStatus *m_mpds;
69
    const MpdStatus *m_mpds;
64
    unsigned int m_options;
70
    unsigned int m_options;
65
    string m_mcachefn;
71
    std::string m_mcachefn;
66
    vector<UpnpService*> m_services;
72
    std::vector<UpnpService*> m_services;
67
};
73
};
68
74
69
75
70
extern string upmpdProtocolInfo;
76
extern std::string upmpdProtocolInfo;
71
77
72
#endif /* _UPMPD_H_X_INCLUDED_ */
78
#endif /* _UPMPD_H_X_INCLUDED_ */