Switch to unified view

a/src/ohradio.hxx b/src/ohradio.hxx
...
...
34
    OHRadio(UpMpd *dev);
34
    OHRadio(UpMpd *dev);
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
    int iStop();
38
    int iStop();
39
    // Source active ?
40
    void setActive(bool onoff) {
41
        m_active = onoff;
42
    }
39
43
40
private:
44
private:
41
    int channel(const SoapIncoming& sc, SoapOutgoing& data);
45
    int channel(const SoapIncoming& sc, SoapOutgoing& data);
42
    int channelsMax(const SoapIncoming& sc, SoapOutgoing& data);
46
    int channelsMax(const SoapIncoming& sc, SoapOutgoing& data);
43
    int id(const SoapIncoming& sc, SoapOutgoing& data);
47
    int id(const SoapIncoming& sc, SoapOutgoing& data);
...
...
53
    int setChannel(const SoapIncoming& sc, SoapOutgoing& data);
57
    int setChannel(const SoapIncoming& sc, SoapOutgoing& data);
54
    int setId(const SoapIncoming& sc, SoapOutgoing& data);
58
    int setId(const SoapIncoming& sc, SoapOutgoing& data);
55
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
59
    int stop(const SoapIncoming& sc, SoapOutgoing& data);
56
    int transportState(const SoapIncoming& sc, SoapOutgoing& data);
60
    int transportState(const SoapIncoming& sc, SoapOutgoing& data);
57
61
62
    std::string metaForId(unsigned int id);
58
    void readRadios();
63
    void readRadios();
59
    
64
    int setPlaying(const std::string& uri);
60
    bool makeIdArray(std::string&);
65
    bool makeIdArray(std::string&);
61
    bool makestate(std::unordered_map<std::string, std::string>& st);
66
    bool makestate(std::unordered_map<std::string, std::string>& st);
62
    void maybeWakeUp(bool ok);
67
    void maybeWakeUp(bool ok);
63
68
64
    // State variable storage
69
    // State variable storage
65
    std::unordered_map<std::string, std::string> m_state;
70
    std::unordered_map<std::string, std::string> m_state;
66
    UpMpd *m_dev;
71
    UpMpd *m_dev;
72
    bool m_active;
67
    unsigned int m_id;
73
    unsigned int m_id;
68
};
74
};
69
75
70
#endif /* _OHRADIO_H_X_INCLUDED_ */
76
#endif /* _OHRADIO_H_X_INCLUDED_ */