Switch to unified view

a/libupnpp/device.hxx b/libupnpp/device.hxx
...
...
70
     *
70
     *
71
     * Will only do something if the previous event is not too recent.
71
     * Will only do something if the previous event is not too recent.
72
     */
72
     */
73
    void loopWakeup(); // To trigger an early event
73
    void loopWakeup(); // To trigger an early event
74
74
75
    /**
76
     * To be called to get the event loop to return
77
     */
78
    void shouldExit();
79
75
    /** Check status */
80
    /** Check status */
76
    bool ok() {return m_lib != 0;}
81
    bool ok() {return m_lib != 0;}
77
82
78
private:
83
private:
79
    const std::string& serviceType(const std::string& serviceId);
84
    const std::string& serviceType(const std::string& serviceId);
...
...
84
    // vector for ordered walking while fetching status. Order is
89
    // vector for ordered walking while fetching status. Order is
85
    // determine by addService() call sequence.
90
    // determine by addService() call sequence.
86
    std::unordered_map<std::string, UpnpService*> m_servicemap;
91
    std::unordered_map<std::string, UpnpService*> m_servicemap;
87
    std::vector<std::string> m_serviceids;
92
    std::vector<std::string> m_serviceids;
88
    std::unordered_map<std::string, soapfun> m_calls;
93
    std::unordered_map<std::string, soapfun> m_calls;
89
94
    bool m_needExit;
90
    static unordered_map<std::string, UpnpDevice *> o_devices;
95
    static unordered_map<std::string, UpnpDevice *> o_devices;
91
96
92
    /* Static callback for libupnp. This looks up the appropriate
97
    /* Static callback for libupnp. This looks up the appropriate
93
     * device using the device ID (UDN), the calls its callback
98
     * device using the device ID (UDN), the calls its callback
94
     * method */
99
     * method */