Switch to unified view

a/libupnpp/control/discovery.hxx b/libupnpp/control/discovery.hxx
...
...
21
#include <functional>
21
#include <functional>
22
22
23
#include "description.hxx"
23
#include "description.hxx"
24
24
25
namespace UPnPClient {
25
namespace UPnPClient {
26
27
static void *discoExplorer(void *);
28
26
29
/**
27
/**
30
 * Manage UPnP discovery and maintain a directory of active devices. Singleton.
28
 * Manage UPnP discovery and maintain a directory of active devices. Singleton.
31
 *
29
 *
32
 *
30
 *
...
...
107
    // Lookup a device in the pool. If not found and a search is active, 
105
    // Lookup a device in the pool. If not found and a search is active, 
108
    // use a cond_wait to wait for device events (awaken by deviceFound).
106
    // use a cond_wait to wait for device events (awaken by deviceFound).
109
    bool getDevBySelector(bool cmp(const UPnPDeviceDesc&, const std::string&), 
107
    bool getDevBySelector(bool cmp(const UPnPDeviceDesc&, const std::string&), 
110
                          const std::string& value, UPnPDeviceDesc& ddesc);
108
                          const std::string& value, UPnPDeviceDesc& ddesc);
111
109
112
    friend void *discoExplorer(void *);
110
    static void *discoExplorer(void *);
113
111
114
    bool m_ok;
112
    bool m_ok;
115
    std::string m_reason;
113
    std::string m_reason;
116
    int m_searchTimeout;
114
    int m_searchTimeout;
117
    time_t m_lastSearch;
115
    time_t m_lastSearch;