Switch to unified view

a/src/upmpd.hxx b/src/upmpd.hxx
...
...
36
    friend class UpMpdAVTransport;
36
    friend class UpMpdAVTransport;
37
    friend class OHInfo;
37
    friend class OHInfo;
38
    friend class OHPlaylist;
38
    friend class OHPlaylist;
39
    friend class OHReceiver;
39
    friend class OHReceiver;
40
40
41
    enum Options {
41
    enum OptFlags {
42
        upmpdNone,
42
        upmpdNone = 0,
43
        // If set, the MPD queue belongs to us, we shall clear
43
        // If set, the MPD queue belongs to us, we shall clear
44
        // it as we like.
44
        // it as we like.
45
        upmpdOwnQueue = 1, 
45
        upmpdOwnQueue = 1, 
46
        // Export OpenHome services
46
        // Export OpenHome services
47
        upmpdDoOH = 2,
47
        upmpdDoOH = 2,
48
        // Save queue metadata to disk for persistence across restarts
48
        // Save queue metadata to disk for persistence across restarts
49
        // (mpd does it)
49
        // (mpd does it)
50
        upmpdOhMetaPersist = 4
50
        upmpdOhMetaPersist = 4
51
    };
51
    };
52
    struct Options {
53
        Options() : options(upmpdNone), ohmetasleep(0), schttpport(8888) {}
54
        unsigned int options;
55
        std::string  cachefn;
56
        unsigned int ohmetasleep;
57
        int schttpport;
58
    };
52
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
59
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
53
          const std::unordered_map<std::string, VDirContent>& files,
60
          const std::unordered_map<std::string, VDirContent>& files,
54
          MPDCli *mpdcli, unsigned int opts, const std::string& cachefn,
61
          MPDCli *mpdcli, Options opts);
55
        int schttpport);
56
    ~UpMpd();
62
    ~UpMpd();
57
63
58
    const MpdStatus &getMpdStatus();
64
    const MpdStatus &getMpdStatus();
59
    const MpdStatus &getMpdStatusNoUpdate()
65
    const MpdStatus &getMpdStatusNoUpdate()
60
        {
66
        {