Switch to unified view

a/upmpd/ohinfo.hxx b/upmpd/ohinfo.hxx
...
...
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
#ifndef _OHINFO_H_X_INCLUDED_
17
#ifndef _OHINFO_H_X_INCLUDED_
18
#define _OHINFO_H_X_INCLUDED_
18
#define _OHINFO_H_X_INCLUDED_
19
19
20
#include <string>
20
#include <string>                       // for string
21
#include <unordered_map>                // for unordered_map
22
#include <vector>                       // for vector
21
23
22
#include "libupnpp/device/device.hxx"
24
#include "libupnpp/device/device.hxx"   // for UpnpService
25
#include "libupnpp/soaphelp.hxx"        // for SoapArgs, SoapData
26
27
class UpMpd;
23
28
24
using namespace UPnPP;
29
using namespace UPnPP;
25
30
26
class UpMpd;
27
28
class OHInfo : public UpnpService {
31
class OHInfo : public UPnPProvider::UpnpService {
29
public:
32
public:
30
    OHInfo(UpMpd *dev);
33
    OHInfo(UpMpd *dev);
31
34
32
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
35
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
33
                              std::vector<std::string>& values);
36
                              std::vector<std::string>& values);
...
...
35
    int counters(const SoapArgs& sc, SoapData& data);
38
    int counters(const SoapArgs& sc, SoapData& data);
36
    int track(const SoapArgs& sc, SoapData& data);
39
    int track(const SoapArgs& sc, SoapData& data);
37
    int details(const SoapArgs& sc, SoapData& data);
40
    int details(const SoapArgs& sc, SoapData& data);
38
    int metatext(const SoapArgs& sc, SoapData& data);
41
    int metatext(const SoapArgs& sc, SoapData& data);
39
42
40
    bool makestate(unordered_map<string, string>& state);
43
    bool makestate(std::unordered_map<std::string, std::string>& state);
41
    void urimetadata(string& uri, string& metadata);
44
    void urimetadata(std::string& uri, std::string& metadata);
42
    void makedetails(string &duration, string& bitrate, 
45
    void makedetails(std::string &duration, std::string& bitrate,
43
                     string& bitdepth, string& samplerate);
46
                     std::string& bitdepth, std::string& samplerate);
44
47
45
    // State variable storage
48
    // State variable storage
46
    unordered_map<string, string> m_state;
49
    std::unordered_map<std::string, std::string> m_state;
47
    UpMpd *m_dev;
50
    UpMpd *m_dev;
48
};
51
};
49
52
50
#endif /* _OHINFO_H_X_INCLUDED_ */
53
#endif /* _OHINFO_H_X_INCLUDED_ */