Switch to unified view

a/src/upmpd.hxx b/src/upmpd.hxx
...
...
26
26
27
class MPDCli;
27
class MPDCli;
28
class MpdStatus;
28
class MpdStatus;
29
29
30
extern std::string g_configfilename;
30
extern std::string g_configfilename;
31
class ConfSimple;
32
extern ConfSimple *g_config;
31
extern std::string g_protocolInfo;
33
extern std::string g_protocolInfo;
32
34
33
using namespace UPnPProvider;
35
using namespace UPnPProvider;
34
36
35
class UpMpdRenderCtl;
37
class UpMpdRenderCtl;
...
...
37
class OHInfo;
39
class OHInfo;
38
class OHPlaylist;
40
class OHPlaylist;
39
class OHProduct;
41
class OHProduct;
40
class OHReceiver;
42
class OHReceiver;
41
class SenderReceiver;
43
class SenderReceiver;
44
class OHRadio;
42
45
43
// The UPnP MPD frontend device with its services
46
// The UPnP MPD frontend device with its services
44
class UpMpd : public UpnpDevice {
47
class UpMpd : public UpnpDevice {
45
public:
48
public:
46
    friend class UpMpdRenderCtl;
49
    friend class UpMpdRenderCtl;
...
...
49
    friend class OHPlaylist;
52
    friend class OHPlaylist;
50
    friend class OHProduct;
53
    friend class OHProduct;
51
    friend class OHReceiver;
54
    friend class OHReceiver;
52
    friend class OHVolume;
55
    friend class OHVolume;
53
    friend class SenderReceiver;
56
    friend class SenderReceiver;
57
    friend class OHRadio;
54
    
58
    
55
    enum OptFlags {
59
    enum OptFlags {
56
        upmpdNone = 0,
60
        upmpdNone = 0,
57
        // If set, the MPD queue belongs to us, we shall clear
61
        // If set, the MPD queue belongs to us, we shall clear
58
        // it as we like.
62
        // it as we like.
...
...
72
    struct Options {
76
    struct Options {
73
        Options() : options(upmpdNone), ohmetasleep(0), schttpport(0),
77
        Options() : options(upmpdNone), ohmetasleep(0), schttpport(0),
74
                    sendermpdport(0) {}
78
                    sendermpdport(0) {}
75
        unsigned int options;
79
        unsigned int options;
76
        std::string  cachefn;
80
        std::string  cachefn;
81
        std::string  radioconf;
77
        unsigned int ohmetasleep;
82
        unsigned int ohmetasleep;
78
        int schttpport;
83
        int schttpport;
79
        std::string scplaymethod;
84
        std::string scplaymethod;
80
        std::string sc2mpdpath;
85
        std::string sc2mpdpath;
81
        std::string senderpath;
86
        std::string senderpath;
...
...
107
    std::string m_mcachefn;
112
    std::string m_mcachefn;
108
    UpMpdRenderCtl *m_rdctl;
113
    UpMpdRenderCtl *m_rdctl;
109
    UpMpdAVTransport *m_avt;
114
    UpMpdAVTransport *m_avt;
110
    OHProduct *m_ohpr;
115
    OHProduct *m_ohpr;
111
    OHPlaylist *m_ohpl;
116
    OHPlaylist *m_ohpl;
117
    OHRadio *m_ohrd;
112
    OHReceiver *m_ohrcv;
118
    OHReceiver *m_ohrcv;
113
    SenderReceiver *m_sndrcv;
119
    SenderReceiver *m_sndrcv;
114
    std::vector<UpnpService*> m_services;
120
    std::vector<UpnpService*> m_services;
115
    std::string m_friendlyname;
121
    std::string m_friendlyname;
116
};
122
};