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
extern std::string g_sc2mpd_path;
32
extern std::string g_protocolInfo;
31
extern std::string g_protocolInfo;
33
32
34
using namespace UPnPProvider;
33
using namespace UPnPProvider;
35
34
36
class UpMpdRenderCtl;
35
class UpMpdRenderCtl;
37
class UpMpdAVTransport;
36
class UpMpdAVTransport;
38
class OHInfo;
37
class OHInfo;
39
class OHPlaylist;
38
class OHPlaylist;
40
class OHProduct;
39
class OHProduct;
41
class OHReceiver;
40
class OHReceiver;
41
class SenderReceiver;
42
42
43
// The UPnP MPD frontend device with its services
43
// The UPnP MPD frontend device with its services
44
class UpMpd : public UpnpDevice {
44
class UpMpd : public UpnpDevice {
45
public:
45
public:
46
    friend class UpMpdRenderCtl;
46
    friend class UpMpdRenderCtl;
...
...
63
        // (mpd does it)
63
        // (mpd does it)
64
        upmpdOhMetaPersist = 4,
64
        upmpdOhMetaPersist = 4,
65
        // sc2mpd was found: advertise songcast receiver
65
        // sc2mpd was found: advertise songcast receiver
66
        upmpdOhReceiver = 8,
66
        upmpdOhReceiver = 8,
67
        // Do not publish UPnP AV services (avtransport and renderer).
67
        // Do not publish UPnP AV services (avtransport and renderer).
68
        upmpdNoAV = 16
68
        upmpdNoAV = 16,
69
        // mpd2sc et al were found: advertise songcast sender/receiver mode
70
        upmpdOhSenderReceiver = 32,
69
    };
71
    };
70
    struct Options {
72
    struct Options {
71
        Options() : options(upmpdNone), ohmetasleep(0), schttpport(0) {}
73
        Options() : options(upmpdNone), ohmetasleep(0), schttpport(0),
74
                    sendermpdport(0) {}
72
        unsigned int options;
75
        unsigned int options;
73
        std::string  cachefn;
76
        std::string  cachefn;
74
        unsigned int ohmetasleep;
77
        unsigned int ohmetasleep;
75
        int schttpport;
78
        int schttpport;
76
        std::string scplaymethod;
79
        std::string scplaymethod;
80
        std::string sc2mpdpath;
81
        std::string senderpath;
82
        int sendermpdport;
77
    };
83
    };
78
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
84
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
79
          const std::unordered_map<std::string, VDirContent>& files,
85
          const std::unordered_map<std::string, VDirContent>& files,
80
          MPDCli *mpdcli, Options opts);
86
          MPDCli *mpdcli, Options opts);
81
    ~UpMpd();
87
    ~UpMpd();
...
...
102
    UpMpdRenderCtl *m_rdctl;
108
    UpMpdRenderCtl *m_rdctl;
103
    UpMpdAVTransport *m_avt;
109
    UpMpdAVTransport *m_avt;
104
    OHProduct *m_ohpr;
110
    OHProduct *m_ohpr;
105
    OHPlaylist *m_ohpl;
111
    OHPlaylist *m_ohpl;
106
    OHReceiver *m_ohrcv;
112
    OHReceiver *m_ohrcv;
113
    SenderReceiver *m_sndrcv;
107
    std::vector<UpnpService*> m_services;
114
    std::vector<UpnpService*> m_services;
108
    std::string m_friendlyname;
115
    std::string m_friendlyname;
109
};
116
};
110
117
111
#endif /* _UPMPD_H_X_INCLUDED_ */
118
#endif /* _UPMPD_H_X_INCLUDED_ */