Rename DeviceMonitor to DeviceManager
This commit is contained in:
parent
7f1af81910
commit
f0c903d539
|
@ -11,7 +11,7 @@ find_package(PkgConfig REQUIRED)
|
|||
add_executable(logid
|
||||
logid.cpp
|
||||
util.cpp
|
||||
DeviceMonitor.cpp
|
||||
DeviceManager.cpp
|
||||
Device.cpp
|
||||
Receiver.cpp
|
||||
backend/Error.cpp
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <thread>
|
||||
#include <sstream>
|
||||
|
||||
#include "DeviceMonitor.h"
|
||||
#include "DeviceManager.h"
|
||||
#include "Receiver.h"
|
||||
#include "util.h"
|
||||
#include "backend/hidpp10/Error.h"
|
||||
|
@ -12,7 +12,7 @@
|
|||
using namespace logid;
|
||||
using namespace logid::backend;
|
||||
|
||||
void DeviceMonitor::addDevice(std::string path)
|
||||
void DeviceManager::addDevice(std::string path)
|
||||
{
|
||||
bool defaultExists = true;
|
||||
bool isReceiver = false;
|
||||
|
@ -59,7 +59,7 @@ void DeviceMonitor::addDevice(std::string path)
|
|||
}
|
||||
}
|
||||
|
||||
void DeviceMonitor::removeDevice(std::string path)
|
||||
void DeviceManager::removeDevice(std::string path)
|
||||
{
|
||||
auto receiver = _receivers.find(path);
|
||||
|
|
@ -13,10 +13,10 @@
|
|||
namespace logid
|
||||
{
|
||||
|
||||
class DeviceMonitor : public backend::raw::DeviceMonitor
|
||||
class DeviceManager : public backend::raw::DeviceMonitor
|
||||
{
|
||||
public:
|
||||
DeviceMonitor() = default;
|
||||
DeviceManager() = default;
|
||||
protected:
|
||||
void addDevice(std::string path) override;
|
||||
void removeDevice(std::string path) override;
|
||||
|
@ -26,7 +26,7 @@ namespace logid
|
|||
std::map<std::string, std::shared_ptr<Receiver>> _receivers;
|
||||
};
|
||||
|
||||
extern DeviceMonitor* finder;
|
||||
extern DeviceManager* finder;
|
||||
}
|
||||
|
||||
#endif //LOGID_DEVICEFINDER_H
|
|
@ -4,7 +4,7 @@
|
|||
#include <mutex>
|
||||
|
||||
#include "util.h"
|
||||
#include "DeviceMonitor.h"
|
||||
#include "DeviceManager.h"
|
||||
#include "logid.h"
|
||||
|
||||
#define evdev_name "logid"
|
||||
|
@ -21,7 +21,7 @@ std::string config_file = DEFAULT_CONFIG_FILE;
|
|||
|
||||
LogLevel logid::global_verbosity = INFO;
|
||||
// Configuration* logid::global_config;
|
||||
DeviceMonitor* logid::finder;
|
||||
DeviceManager* logid::finder;
|
||||
|
||||
bool logid::kill_logid = false;
|
||||
std::mutex logid::finder_reloading;
|
||||
|
@ -166,7 +166,7 @@ int main(int argc, char** argv)
|
|||
*/
|
||||
|
||||
// Scan devices, create listeners, handlers, etc.
|
||||
finder = new DeviceMonitor();
|
||||
finder = new DeviceManager();
|
||||
|
||||
while(!kill_logid)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user