Switch to unified view

a/src/ohreceiver.hxx b/src/ohreceiver.hxx
...
...
34
34
35
struct OHReceiverParams {
35
struct OHReceiverParams {
36
    enum PlayMethod {OHRP_MPD, OHRP_ALSA};
36
    enum PlayMethod {OHRP_MPD, OHRP_ALSA};
37
    PlayMethod pm;
37
    PlayMethod pm;
38
    int httpport;
38
    int httpport;
39
    std::string sc2mpdpath;
39
    OHReceiverParams() : pm(OHRP_MPD), httpport(8768) {}
40
    OHReceiverParams() : pm(OHRP_MPD), httpport(8768) {}
40
};
41
};
41
42
42
class OHReceiver : public UPnPProvider::UpnpService {
43
class OHReceiver : public UPnPProvider::UpnpService {
43
public:
44
public:
...
...
47
                              std::vector<std::string>& values);
48
                              std::vector<std::string>& values);
48
49
49
    bool iStop();
50
    bool iStop();
50
    bool iPlay();
51
    bool iPlay();
51
    bool iSetSender(const std::string& uri, const std::string& meta);
52
    bool iSetSender(const std::string& uri, const std::string& meta);
52
53
    OHReceiverParams::PlayMethod playMethod() {return m_pm;}
54
    
53
private:
55
private:
54
    int play(const SoapIncoming& sc, SoapOutgoing& data);
56
    int play(const SoapIncoming& sc, SoapOutgoing& data);
55
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
57
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
56
    int setSender(const SoapIncoming& sc, SoapOutgoing& data);
58
    int setSender(const SoapIncoming& sc, SoapOutgoing& data);
57
    int sender(const SoapIncoming& sc, SoapOutgoing& data);
59
    int sender(const SoapIncoming& sc, SoapOutgoing& data);
...
...
68
    std::string m_metadata;
70
    std::string m_metadata;
69
71
70
    UpMpd *m_dev;
72
    UpMpd *m_dev;
71
    std::shared_ptr<ExecCmd> m_cmd;
73
    std::shared_ptr<ExecCmd> m_cmd;
72
    int m_httpport;
74
    int m_httpport;
75
    std::string m_sc2mpdpath;
73
    std::string m_httpuri;
76
    std::string m_httpuri;
74
    OHReceiverParams::PlayMethod m_pm;
77
    OHReceiverParams::PlayMethod m_pm;
75
};
78
};
76
79
77
#endif /* _OHRECEIVER_H_X_INCLUDED_ */
80
#endif /* _OHRECEIVER_H_X_INCLUDED_ */