Switch to unified view

a/src/ohvolume.hxx b/src/ohvolume.hxx
...
...
20
#include <string>                       // for string
20
#include <string>                       // for string
21
#include <unordered_map>                // for unordered_map
21
#include <unordered_map>                // for unordered_map
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 SoapArgs, SoapData
25
#include "libupnpp/soaphelp.hxx"        // for SoapIncoming, SoapOutgoing
26
26
27
class UpMpd;
27
class UpMpd;
28
class UpMpdRenderCtl;
28
class UpMpdRenderCtl;
29
29
30
using namespace UPnPP;
30
using namespace UPnPP;
...
...
34
    OHVolume(UpMpd *dev, UpMpdRenderCtl *ctl);
34
    OHVolume(UpMpd *dev, UpMpdRenderCtl *ctl);
35
35
36
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
36
    virtual bool getEventData(bool all, std::vector<std::string>& names, 
37
                              std::vector<std::string>& values);
37
                              std::vector<std::string>& values);
38
private:
38
private:
39
    int characteristics(const SoapArgs& sc, SoapData& data);
39
    int characteristics(const SoapIncoming& sc, SoapOutgoing& data);
40
    int setVolume(const SoapArgs& sc, SoapData& data);
40
    int setVolume(const SoapIncoming& sc, SoapOutgoing& data);
41
    int volume(const SoapArgs& sc, SoapData& data);
41
    int volume(const SoapIncoming& sc, SoapOutgoing& data);
42
    int volumeInc(const SoapArgs& sc, SoapData& data);
42
    int volumeInc(const SoapIncoming& sc, SoapOutgoing& data);
43
    int volumeDec(const SoapArgs& sc, SoapData& data);
43
    int volumeDec(const SoapIncoming& sc, SoapOutgoing& data);
44
    int volumeLimit(const SoapArgs& sc, SoapData& data);
44
    int volumeLimit(const SoapIncoming& sc, SoapOutgoing& data);
45
    int mute(const SoapArgs& sc, SoapData& data);
45
    int mute(const SoapIncoming& sc, SoapOutgoing& data);
46
    int setMute(const SoapArgs& sc, SoapData& data);
46
    int setMute(const SoapIncoming& sc, SoapOutgoing& data);
47
47
48
    bool makestate(std::unordered_map<std::string, std::string> &st);
48
    bool makestate(std::unordered_map<std::string, std::string> &st);
49
    // State variable storage
49
    // State variable storage
50
    std::unordered_map<std::string, std::string> m_state;
50
    std::unordered_map<std::string, std::string> m_state;
51
    UpMpd *m_dev;
51
    UpMpd *m_dev;