Switch to unified view

a/src/upmpd.hxx b/src/upmpd.hxx
...
...
31
extern std::string g_sc2mpd_path;
31
extern std::string g_sc2mpd_path;
32
extern std::string g_protocolInfo;
32
extern std::string g_protocolInfo;
33
33
34
using namespace UPnPProvider;
34
using namespace UPnPProvider;
35
35
36
class UpMpdRenderCtl;
37
class UpMpdAVTransport;
38
class OHInfo;
39
class OHPlaylist;
40
class OHProduct;
41
class OHReceiver;
42
36
// The UPnP MPD frontend device with its services
43
// The UPnP MPD frontend device with its services
37
class UpMpd : public UpnpDevice {
44
class UpMpd : public UpnpDevice {
38
public:
45
public:
39
    friend class UpMpdRenderCtl;
46
    friend class UpMpdRenderCtl;
40
    friend class UpMpdAVTransport;
47
    friend class UpMpdAVTransport;
41
    friend class OHInfo;
48
    friend class OHInfo;
42
    friend class OHPlaylist;
49
    friend class OHPlaylist;
50
    friend class OHProduct;
43
    friend class OHReceiver;
51
    friend class OHReceiver;
44
52
    friend class OHVolume;
53
    friend class SenderReceiver;
54
    
45
    enum OptFlags {
55
    enum OptFlags {
46
        upmpdNone = 0,
56
        upmpdNone = 0,
47
        // If set, the MPD queue belongs to us, we shall clear
57
        // If set, the MPD queue belongs to us, we shall clear
48
        // it as we like.
58
        // it as we like.
49
        upmpdOwnQueue = 1, 
59
        upmpdOwnQueue = 1, 
...
...
87
private:
97
private:
88
    MPDCli *m_mpdcli;
98
    MPDCli *m_mpdcli;
89
    const MpdStatus *m_mpds;
99
    const MpdStatus *m_mpds;
90
    unsigned int m_options;
100
    unsigned int m_options;
91
    std::string m_mcachefn;
101
    std::string m_mcachefn;
102
    UpMpdRenderCtl *m_rdctl;
103
    UpMpdAVTransport *m_avt;
104
    OHProduct *m_ohpr;
105
    OHPlaylist *m_ohpl;
106
    OHReceiver *m_ohrcv;
92
    std::vector<UpnpService*> m_services;
107
    std::vector<UpnpService*> m_services;
93
};
108
};
94
109
95
#endif /* _UPMPD_H_X_INCLUDED_ */
110
#endif /* _UPMPD_H_X_INCLUDED_ */