Switch to unified view

a/src/ohreceiver.hxx b/src/ohreceiver.hxx
...
...
27
27
28
#include "ohservice.hxx"
28
#include "ohservice.hxx"
29
#include "execmd.h"
29
#include "execmd.h"
30
30
31
using namespace UPnPP;
31
using namespace UPnPP;
32
class ConfSimple;
32
class UpMpd;
33
class UpMpd;
33
class OHPlaylist;
34
class OHPlaylist;
34
class OHProduct;
35
class OHProduct;
35
36
36
struct OHReceiverParams {
37
struct OHReceiverParams {
37
    enum PlayMethod {OHRP_MPD, OHRP_ALSA};
38
    enum PlayMethod {OHRP_MPD, OHRP_ALSA};
38
    PlayMethod pm;
39
    PlayMethod pm;
39
    int httpport;
40
    int httpport;
40
    std::string sc2mpdpath;
41
    std::string sc2mpdpath;
42
    std::string screceiverstatefile;
41
    OHReceiverParams() : pm(OHRP_MPD), httpport(8768) {}
43
    OHReceiverParams() : pm(OHRP_MPD), httpport(8768) {}
42
};
44
};
43
45
44
class OHReceiver : public OHService {
46
class OHReceiver : public OHService {
45
public:
47
public:
...
...
61
    int sender(const SoapIncoming& sc, SoapOutgoing& data);
63
    int sender(const SoapIncoming& sc, SoapOutgoing& data);
62
    int protocolInfo(const SoapIncoming& sc, SoapOutgoing& data);
64
    int protocolInfo(const SoapIncoming& sc, SoapOutgoing& data);
63
    int transportState(const SoapIncoming& sc, SoapOutgoing& data);
65
    int transportState(const SoapIncoming& sc, SoapOutgoing& data);
64
66
65
    void maybeWakeUp(bool ok);
67
    void maybeWakeUp(bool ok);
68
    void setSenderFromConf();
69
    void writeSenderToConf();
66
70
67
    // Current
71
    // Current
68
    std::string m_uri;
72
    std::string m_uri;
69
    std::string m_metadata;
73
    std::string m_metadata;
70
74
...
...
72
    std::shared_ptr<ExecCmd> m_cmd;
76
    std::shared_ptr<ExecCmd> m_cmd;
73
    int m_httpport;
77
    int m_httpport;
74
    std::string m_sc2mpdpath;
78
    std::string m_sc2mpdpath;
75
    std::string m_httpuri;
79
    std::string m_httpuri;
76
    OHReceiverParams::PlayMethod m_pm;
80
    OHReceiverParams::PlayMethod m_pm;
81
    ConfSimple *m_conf;
77
};
82
};
78
83
79
#endif /* _OHRECEIVER_H_X_INCLUDED_ */
84
#endif /* _OHRECEIVER_H_X_INCLUDED_ */