Switch to unified view

a/src/upmpd.hxx b/src/upmpd.hxx
...
...
81
            sendermpdport(0) {}
81
            sendermpdport(0) {}
82
        unsigned int options;
82
        unsigned int options;
83
        std::string  cachedir;
83
        std::string  cachedir;
84
        std::string  cachefn;
84
        std::string  cachefn;
85
        std::string  radioconf;
85
        std::string  radioconf;
86
        std::string  iconpath;
87
        std::string  presentationhtml;
86
        unsigned int ohmetasleep;
88
        unsigned int ohmetasleep;
87
        int schttpport;
89
        int schttpport;
88
        std::string scplaymethod;
90
        std::string scplaymethod;
89
        std::string sc2mpdpath;
91
        std::string sc2mpdpath;
90
        std::string screceiverstatefile;
92
        std::string screceiverstatefile;
91
        std::string senderpath;
93
        std::string senderpath;
92
        int sendermpdport;
94
        int sendermpdport;
93
    };
95
    };
94
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
96
    UpMpd(const std::string& deviceid, const std::string& friendlyname,
95
          ohProductDesc_t& ohProductDesc,
97
          ohProductDesc_t& ohProductDesc,
96
          const std::unordered_map<std::string, VDirContent>& files,
97
          MPDCli *mpdcli, Options opts);
98
          MPDCli *mpdcli, Options opts);
98
    ~UpMpd();
99
    ~UpMpd();
100
101
    virtual bool readLibFile(const std::string& name,
102
                             std::string& contents);
99
103
100
    const MpdStatus& getMpdStatus();
104
    const MpdStatus& getMpdStatus();
101
    const MpdStatus& getMpdStatusNoUpdate() {
105
    const MpdStatus& getMpdStatusNoUpdate() {
102
        if (m_mpds == 0) {
106
        if (m_mpds == 0) {
103
            return getMpdStatus();
107
            return getMpdStatus();
...
...
128
132
129
private:
133
private:
130
    MPDCli *m_mpdcli;
134
    MPDCli *m_mpdcli;
131
    const MpdStatus *m_mpds;
135
    const MpdStatus *m_mpds;
132
    unsigned int m_options;
136
    unsigned int m_options;
137
    Options m_allopts;
133
    std::string m_mcachefn;
138
    std::string m_mcachefn;
134
    UpMpdRenderCtl *m_rdctl;
139
    UpMpdRenderCtl *m_rdctl;
135
    UpMpdAVTransport *m_avt;
140
    UpMpdAVTransport *m_avt;
136
    OHProduct *m_ohpr;
141
    OHProduct *m_ohpr;
137
    OHPlaylist *m_ohpl;
142
    OHPlaylist *m_ohpl;