Switch to unified view

a/src/ohinfo.hxx b/src/ohinfo.hxx
...
...
22
#include <vector>                       // for vector
22
#include <vector>                       // for vector
23
23
24
#include "libupnpp/device/device.hxx"   // for UpnpService
24
#include "libupnpp/device/device.hxx"   // for UpnpService
25
#include "libupnpp/soaphelp.hxx"        // for SoapIncoming, SoapOutgoing
25
#include "libupnpp/soaphelp.hxx"        // for SoapIncoming, SoapOutgoing
26
26
27
class UpMpd;
27
#include "ohservice.hxx"
28
28
29
using namespace UPnPP;
29
using namespace UPnPP;
30
30
31
class OHInfo : public UPnPProvider::UpnpService {
31
class OHInfo : public OHService {
32
public:
32
public:
33
    OHInfo(UpMpd *dev);
33
    OHInfo(UpMpd *dev);
34
34
35
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
36
                              std::vector<std::string>& values);
37
    void setMetatext(const std::string& metatext);
35
    void setMetatext(const std::string& metatext);
36
37
protected:
38
    virtual bool makestate(std::unordered_map<std::string, std::string>& state);
39
38
private:
40
private:
39
    int counters(const SoapIncoming& sc, SoapOutgoing& data);
41
    int counters(const SoapIncoming& sc, SoapOutgoing& data);
40
    int track(const SoapIncoming& sc, SoapOutgoing& data);
42
    int track(const SoapIncoming& sc, SoapOutgoing& data);
41
    int details(const SoapIncoming& sc, SoapOutgoing& data);
43
    int details(const SoapIncoming& sc, SoapOutgoing& data);
42
    int metatext(const SoapIncoming& sc, SoapOutgoing& data);
44
    int metatext(const SoapIncoming& sc, SoapOutgoing& data);
43
45
44
    bool makestate(std::unordered_map<std::string, std::string>& state);
45
    void urimetadata(std::string& uri, std::string& metadata);
46
    void urimetadata(std::string& uri, std::string& metadata);
46
    void makedetails(std::string &duration, std::string& bitrate,
47
    void makedetails(std::string &duration, std::string& bitrate,
47
                     std::string& bitdepth, std::string& samplerate);
48
                     std::string& bitdepth, std::string& samplerate);
48
49
49
    // State variable storage
50
    std::unordered_map<std::string, std::string> m_state;
51
    std::string m_metatext;
50
    std::string m_metatext;
52
    UpMpd *m_dev;
53
};
51
};
54
52
55
#endif /* _OHINFO_H_X_INCLUDED_ */
53
#endif /* _OHINFO_H_X_INCLUDED_ */