Moved logger file.

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)

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

VCamUtils/src/logger.cpp

@@ -25,7 +25,7 @@
 #include <thread>
 
 #include "logger.h"
-#include "../utils.h"
+#include "utils.h"
 
 namespace AkVCam
 {

VCamUtils/src/logger.h

@@ -22,7 +22,7 @@
 
 #include <iostream>
 
-#include "../utils.h"
+#include "utils.h"
 
 #define AKVCAM_LOGLEVEL_DEFAULT    -1
 #define AKVCAM_LOGLEVEL_EMERGENCY   0

VCamUtils/src/settings.cpp

@@ -24,7 +24,7 @@
 
 #include "settings.h"
 #include "fraction.h"
-#include "logger/logger.h"
+#include "logger.h"
 
 namespace AkVCam
 {

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)

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)
 

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)
 

cmio/PlatformUtils/src/utils.cpp

@@ -25,7 +25,7 @@
 #import <CoreGraphics/CGDataProvider.h>
 
 #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"
 

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) \

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):

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),

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)

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
 {

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
 {

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)
 {

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
 {

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
 {

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\\"
 

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
 {

dshow/PlatformUtils/src/utils.h

@@ -24,7 +24,7 @@
 #include <strmif.h>
 
 #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

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
 {