From f7a1dcd2182738baa29137fd9857718c62c379f7 Mon Sep 17 00:00:00 2001 From: Gonzalo Exequiel Pedone Date: Tue, 6 Oct 2020 13:07:27 -0300 Subject: [PATCH] Moved logger file. --- Manager/src/cmdparser.cpp | 2 +- VCamUtils/VCamUtils.pro | 4 ++-- VCamUtils/src/{logger => }/logger.cpp | 2 +- VCamUtils/src/{logger => }/logger.h | 2 +- VCamUtils/src/settings.cpp | 2 +- cmio/Assistant/src/assistant.cpp | 2 +- cmio/Assistant/src/main.cpp | 2 +- cmio/PlatformUtils/src/preferences.cpp | 2 +- cmio/PlatformUtils/src/utils.cpp | 2 +- cmio/VCamIPC/src/ipcbridge.mm | 2 +- cmio/VirtualCamera/src/device.cpp | 2 +- cmio/VirtualCamera/src/objectinterface.cpp | 2 +- cmio/VirtualCamera/src/plugin.cpp | 2 +- cmio/VirtualCamera/src/plugininterface.cpp | 2 +- cmio/VirtualCamera/src/stream.cpp | 2 +- dshow/Assistant/src/main.cpp | 2 +- dshow/Assistant/src/service.cpp | 2 +- dshow/PlatformUtils/src/messageserver.cpp | 2 +- dshow/PlatformUtils/src/preferences.cpp | 2 +- dshow/PlatformUtils/src/sharedmemory.cpp | 2 +- dshow/PlatformUtils/src/utils.h | 2 +- dshow/VCamIPC/src/ipcbridge.cpp | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) rename VCamUtils/src/{logger => }/logger.cpp (99%) rename VCamUtils/src/{logger => }/logger.h (99%) diff --git a/Manager/src/cmdparser.cpp b/Manager/src/cmdparser.cpp index 3075e05..096ef86 100644 --- a/Manager/src/cmdparser.cpp +++ b/Manager/src/cmdparser.cpp @@ -29,7 +29,7 @@ #include "VCamUtils/src/settings.h" #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/image/videoframe.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" #define AKVCAM_BIND_FUNC(member) \ std::bind(&member, this->d, std::placeholders::_1, std::placeholders::_2) diff --git a/VCamUtils/VCamUtils.pro b/VCamUtils/VCamUtils.pro index 317581b..6c6e268 100644 --- a/VCamUtils/VCamUtils.pro +++ b/VCamUtils/VCamUtils.pro @@ -42,7 +42,7 @@ SOURCES += \ src/fraction.cpp \ src/image/videoformat.cpp \ src/image/videoframe.cpp \ - src/logger/logger.cpp \ + src/logger.cpp \ src/settings.cpp \ src/timer.cpp \ src/utils.cpp @@ -55,7 +55,7 @@ HEADERS += \ src/image/videoframetypes.h \ src/image/videoformattypes.h \ src/ipcbridge.h \ - src/logger/logger.h \ + src/logger.h \ src/settings.h \ src/timer.h \ src/utils.h diff --git a/VCamUtils/src/logger/logger.cpp b/VCamUtils/src/logger.cpp similarity index 99% rename from VCamUtils/src/logger/logger.cpp rename to VCamUtils/src/logger.cpp index b1af5ec..b92a45b 100644 --- a/VCamUtils/src/logger/logger.cpp +++ b/VCamUtils/src/logger.cpp @@ -25,7 +25,7 @@ #include #include "logger.h" -#include "../utils.h" +#include "utils.h" namespace AkVCam { diff --git a/VCamUtils/src/logger/logger.h b/VCamUtils/src/logger.h similarity index 99% rename from VCamUtils/src/logger/logger.h rename to VCamUtils/src/logger.h index 62b7e7b..edd5b31 100644 --- a/VCamUtils/src/logger/logger.h +++ b/VCamUtils/src/logger.h @@ -22,7 +22,7 @@ #include -#include "../utils.h" +#include "utils.h" #define AKVCAM_LOGLEVEL_DEFAULT -1 #define AKVCAM_LOGLEVEL_EMERGENCY 0 diff --git a/VCamUtils/src/settings.cpp b/VCamUtils/src/settings.cpp index 20c0cb6..8feba2c 100644 --- a/VCamUtils/src/settings.cpp +++ b/VCamUtils/src/settings.cpp @@ -24,7 +24,7 @@ #include "settings.h" #include "fraction.h" -#include "logger/logger.h" +#include "logger.h" namespace AkVCam { diff --git a/cmio/Assistant/src/assistant.cpp b/cmio/Assistant/src/assistant.cpp index 5d1bcdd..6a5282e 100644 --- a/cmio/Assistant/src/assistant.cpp +++ b/cmio/Assistant/src/assistant.cpp @@ -31,7 +31,7 @@ #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/image/videoframe.h" #include "VCamUtils/src/ipcbridge.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" #define AKVCAM_BIND_FUNC(member) \ std::bind(&member, this, std::placeholders::_1, std::placeholders::_2) diff --git a/cmio/Assistant/src/main.cpp b/cmio/Assistant/src/main.cpp index 4fd5399..f3105f5 100644 --- a/cmio/Assistant/src/main.cpp +++ b/cmio/Assistant/src/main.cpp @@ -25,7 +25,7 @@ #include "assistant.h" #include "assistantglobals.h" #include "PlatformUtils/src/preferences.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" GLOBAL_STATIC(AkVCam::Assistant, assistant) diff --git a/cmio/PlatformUtils/src/preferences.cpp b/cmio/PlatformUtils/src/preferences.cpp index 1ead2fb..d399912 100644 --- a/cmio/PlatformUtils/src/preferences.cpp +++ b/cmio/PlatformUtils/src/preferences.cpp @@ -22,7 +22,7 @@ #include "preferences.h" #include "utils.h" #include "VCamUtils/src/image/videoformat.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" #define PREFERENCES_ID CFSTR(CMIO_ASSISTANT_NAME) diff --git a/cmio/PlatformUtils/src/utils.cpp b/cmio/PlatformUtils/src/utils.cpp index 5c90124..bab83ac 100644 --- a/cmio/PlatformUtils/src/utils.cpp +++ b/cmio/PlatformUtils/src/utils.cpp @@ -25,7 +25,7 @@ #import #include "utils.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/image/videoframe.h" diff --git a/cmio/VCamIPC/src/ipcbridge.mm b/cmio/VCamIPC/src/ipcbridge.mm index 23b01db..59447ac 100644 --- a/cmio/VCamIPC/src/ipcbridge.mm +++ b/cmio/VCamIPC/src/ipcbridge.mm @@ -39,7 +39,7 @@ #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/image/videoframe.h" #include "VCamUtils/src/ipcbridge.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" #include "VCamUtils/src/utils.h" #define AKVCAM_BIND_FUNC(member) \ diff --git a/cmio/VirtualCamera/src/device.cpp b/cmio/VirtualCamera/src/device.cpp index 4037726..07e65f9 100644 --- a/cmio/VirtualCamera/src/device.cpp +++ b/cmio/VirtualCamera/src/device.cpp @@ -19,7 +19,7 @@ #include "device.h" #include "PlatformUtils/src/utils.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" AkVCam::Device::Device(CMIOHardwarePlugInRef pluginInterface, bool registerObject): diff --git a/cmio/VirtualCamera/src/objectinterface.cpp b/cmio/VirtualCamera/src/objectinterface.cpp index fe0ca55..eeff73b 100644 --- a/cmio/VirtualCamera/src/objectinterface.cpp +++ b/cmio/VirtualCamera/src/objectinterface.cpp @@ -19,7 +19,7 @@ #include "objectinterface.h" #include "PlatformUtils/src/utils.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" AkVCam::ObjectInterface::ObjectInterface(): m_objectID(0), diff --git a/cmio/VirtualCamera/src/plugin.cpp b/cmio/VirtualCamera/src/plugin.cpp index 0513310..de2482e 100644 --- a/cmio/VirtualCamera/src/plugin.cpp +++ b/cmio/VirtualCamera/src/plugin.cpp @@ -21,7 +21,7 @@ #include "PlatformUtils/src/preferences.h" #include "PlatformUtils/src/utils.h" #include "VCamUtils/src/ipcbridge.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" extern "C" void *akPluginMain(CFAllocatorRef allocator, CFUUIDRef requestedTypeUUID) diff --git a/cmio/VirtualCamera/src/plugininterface.cpp b/cmio/VirtualCamera/src/plugininterface.cpp index d5d9298..bc2ecfd 100644 --- a/cmio/VirtualCamera/src/plugininterface.cpp +++ b/cmio/VirtualCamera/src/plugininterface.cpp @@ -28,7 +28,7 @@ #include "PlatformUtils/src/utils.h" #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/ipcbridge.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" namespace AkVCam { diff --git a/cmio/VirtualCamera/src/stream.cpp b/cmio/VirtualCamera/src/stream.cpp index 7d95ad2..8afbd70 100644 --- a/cmio/VirtualCamera/src/stream.cpp +++ b/cmio/VirtualCamera/src/stream.cpp @@ -31,7 +31,7 @@ #include "PlatformUtils/src/utils.h" #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/image/videoframe.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" namespace AkVCam { diff --git a/dshow/Assistant/src/main.cpp b/dshow/Assistant/src/main.cpp index 8e32d75..10650f0 100644 --- a/dshow/Assistant/src/main.cpp +++ b/dshow/Assistant/src/main.cpp @@ -23,7 +23,7 @@ #include "service.h" #include "PlatformUtils/src/preferences.h" #include "PlatformUtils/src/utils.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" int main(int argc, char **argv) { diff --git a/dshow/Assistant/src/service.cpp b/dshow/Assistant/src/service.cpp index 40646e2..bc10e59 100644 --- a/dshow/Assistant/src/service.cpp +++ b/dshow/Assistant/src/service.cpp @@ -34,7 +34,7 @@ #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/image/videoframe.h" #include "VCamUtils/src/timer.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" namespace AkVCam { diff --git a/dshow/PlatformUtils/src/messageserver.cpp b/dshow/PlatformUtils/src/messageserver.cpp index c1563a4..e589fe9 100644 --- a/dshow/PlatformUtils/src/messageserver.cpp +++ b/dshow/PlatformUtils/src/messageserver.cpp @@ -26,7 +26,7 @@ #include "messageserver.h" #include "utils.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" namespace AkVCam { diff --git a/dshow/PlatformUtils/src/preferences.cpp b/dshow/PlatformUtils/src/preferences.cpp index 9be352a..5078485 100644 --- a/dshow/PlatformUtils/src/preferences.cpp +++ b/dshow/PlatformUtils/src/preferences.cpp @@ -28,7 +28,7 @@ #include "preferences.h" #include "utils.h" #include "VCamUtils/src/image/videoformat.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" #define REG_PREFIX "SOFTWARE\\Webcamoid\\VirtualCamera\\" diff --git a/dshow/PlatformUtils/src/sharedmemory.cpp b/dshow/PlatformUtils/src/sharedmemory.cpp index b5bca27..64be012 100644 --- a/dshow/PlatformUtils/src/sharedmemory.cpp +++ b/dshow/PlatformUtils/src/sharedmemory.cpp @@ -22,7 +22,7 @@ #include "sharedmemory.h" #include "mutex.h" #include "utils.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" namespace AkVCam { diff --git a/dshow/PlatformUtils/src/utils.h b/dshow/PlatformUtils/src/utils.h index 86b56dc..6c65c36 100644 --- a/dshow/PlatformUtils/src/utils.h +++ b/dshow/PlatformUtils/src/utils.h @@ -24,7 +24,7 @@ #include #include "VCamUtils/src/image/videoformattypes.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" #define AkLogInterface(interface, instance) \ AkLogInfo() << "Returning " << #interface << "(" << instance << ")" << std::endl diff --git a/dshow/VCamIPC/src/ipcbridge.cpp b/dshow/VCamIPC/src/ipcbridge.cpp index aa868c8..e8b618d 100644 --- a/dshow/VCamIPC/src/ipcbridge.cpp +++ b/dshow/VCamIPC/src/ipcbridge.cpp @@ -37,7 +37,7 @@ #include "VCamUtils/src/image/videoformat.h" #include "VCamUtils/src/image/videoframe.h" #include "VCamUtils/src/ipcbridge.h" -#include "VCamUtils/src/logger/logger.h" +#include "VCamUtils/src/logger.h" namespace AkVCam {