Switch to unified view

a/upmpd/ohvolume.hxx b/upmpd/ohvolume.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 _OHVOLUME_H_X_INCLUDED_
17
#ifndef _OHVOLUME_H_X_INCLUDED_
18
#define _OHVOLUME_H_X_INCLUDED_
18
#define _OHVOLUME_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
23
25
#include "libupnpp/soaphelp.hxx"        // for SoapArgs, SoapData
24
using namespace UPnPP;
25
26
26
class UpMpd;
27
class UpMpd;
27
class UpMpdRenderCtl;
28
class UpMpdRenderCtl;
28
29
30
using namespace UPnPP;
31
29
class OHVolume : public UpnpService {
32
class OHVolume : public UPnPProvider::UpnpService {
30
public:
33
public:
31
    OHVolume(UpMpd *dev, UpMpdRenderCtl *ctl);
34
    OHVolume(UpMpd *dev, UpMpdRenderCtl *ctl);
32
35
33
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
36
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
34
                              std::vector<std::string>& values);
37
                              std::vector<std::string>& values);
...
...
40
    int volumeDec(const SoapArgs& sc, SoapData& data);
43
    int volumeDec(const SoapArgs& sc, SoapData& data);
41
    int volumeLimit(const SoapArgs& sc, SoapData& data);
44
    int volumeLimit(const SoapArgs& sc, SoapData& data);
42
    int mute(const SoapArgs& sc, SoapData& data);
45
    int mute(const SoapArgs& sc, SoapData& data);
43
    int setMute(const SoapArgs& sc, SoapData& data);
46
    int setMute(const SoapArgs& sc, SoapData& data);
44
47
45
    bool makestate(unordered_map<string, string> &st);
48
    bool makestate(std::unordered_map<std::string, std::string> &st);
46
    // State variable storage
49
    // State variable storage
47
    unordered_map<string, string> m_state;
50
    std::unordered_map<std::string, std::string> m_state;
48
    UpMpd *m_dev;
51
    UpMpd *m_dev;
49
    UpMpdRenderCtl *m_ctl;
52
    UpMpdRenderCtl *m_ctl;
50
};
53
};
51
54
52
#endif /* _OHVOLUME_H_X_INCLUDED_ */
55
#endif /* _OHVOLUME_H_X_INCLUDED_ */