Moved logger file.
This commit is contained in:
parent
716a67221b
commit
f7a1dcd218
22 changed files with 23 additions and 23 deletions
|
@ -29,7 +29,7 @@
|
||||||
#include "VCamUtils/src/settings.h"
|
#include "VCamUtils/src/settings.h"
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/image/videoframe.h"
|
#include "VCamUtils/src/image/videoframe.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
#define AKVCAM_BIND_FUNC(member) \
|
#define AKVCAM_BIND_FUNC(member) \
|
||||||
std::bind(&member, this->d, std::placeholders::_1, std::placeholders::_2)
|
std::bind(&member, this->d, std::placeholders::_1, std::placeholders::_2)
|
||||||
|
|
|
@ -42,7 +42,7 @@ SOURCES += \
|
||||||
src/fraction.cpp \
|
src/fraction.cpp \
|
||||||
src/image/videoformat.cpp \
|
src/image/videoformat.cpp \
|
||||||
src/image/videoframe.cpp \
|
src/image/videoframe.cpp \
|
||||||
src/logger/logger.cpp \
|
src/logger.cpp \
|
||||||
src/settings.cpp \
|
src/settings.cpp \
|
||||||
src/timer.cpp \
|
src/timer.cpp \
|
||||||
src/utils.cpp
|
src/utils.cpp
|
||||||
|
@ -55,7 +55,7 @@ HEADERS += \
|
||||||
src/image/videoframetypes.h \
|
src/image/videoframetypes.h \
|
||||||
src/image/videoformattypes.h \
|
src/image/videoformattypes.h \
|
||||||
src/ipcbridge.h \
|
src/ipcbridge.h \
|
||||||
src/logger/logger.h \
|
src/logger.h \
|
||||||
src/settings.h \
|
src/settings.h \
|
||||||
src/timer.h \
|
src/timer.h \
|
||||||
src/utils.h
|
src/utils.h
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
#include "logger.h"
|
#include "logger.h"
|
||||||
#include "../utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
|
@ -22,7 +22,7 @@
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include "../utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
#define AKVCAM_LOGLEVEL_DEFAULT -1
|
#define AKVCAM_LOGLEVEL_DEFAULT -1
|
||||||
#define AKVCAM_LOGLEVEL_EMERGENCY 0
|
#define AKVCAM_LOGLEVEL_EMERGENCY 0
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
#include "fraction.h"
|
#include "fraction.h"
|
||||||
#include "logger/logger.h"
|
#include "logger.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/image/videoframe.h"
|
#include "VCamUtils/src/image/videoframe.h"
|
||||||
#include "VCamUtils/src/ipcbridge.h"
|
#include "VCamUtils/src/ipcbridge.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
#define AKVCAM_BIND_FUNC(member) \
|
#define AKVCAM_BIND_FUNC(member) \
|
||||||
std::bind(&member, this, std::placeholders::_1, std::placeholders::_2)
|
std::bind(&member, this, std::placeholders::_1, std::placeholders::_2)
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "assistant.h"
|
#include "assistant.h"
|
||||||
#include "assistantglobals.h"
|
#include "assistantglobals.h"
|
||||||
#include "PlatformUtils/src/preferences.h"
|
#include "PlatformUtils/src/preferences.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
GLOBAL_STATIC(AkVCam::Assistant, assistant)
|
GLOBAL_STATIC(AkVCam::Assistant, assistant)
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "preferences.h"
|
#include "preferences.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "VCamUtils/src/image/videoformat.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)
|
#define PREFERENCES_ID CFSTR(CMIO_ASSISTANT_NAME)
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#import <CoreGraphics/CGDataProvider.h>
|
#import <CoreGraphics/CGDataProvider.h>
|
||||||
|
|
||||||
#include "utils.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/videoformat.h"
|
||||||
#include "VCamUtils/src/image/videoframe.h"
|
#include "VCamUtils/src/image/videoframe.h"
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/image/videoframe.h"
|
#include "VCamUtils/src/image/videoframe.h"
|
||||||
#include "VCamUtils/src/ipcbridge.h"
|
#include "VCamUtils/src/ipcbridge.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
#include "VCamUtils/src/utils.h"
|
#include "VCamUtils/src/utils.h"
|
||||||
|
|
||||||
#define AKVCAM_BIND_FUNC(member) \
|
#define AKVCAM_BIND_FUNC(member) \
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "device.h"
|
#include "device.h"
|
||||||
#include "PlatformUtils/src/utils.h"
|
#include "PlatformUtils/src/utils.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
AkVCam::Device::Device(CMIOHardwarePlugInRef pluginInterface,
|
AkVCam::Device::Device(CMIOHardwarePlugInRef pluginInterface,
|
||||||
bool registerObject):
|
bool registerObject):
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "objectinterface.h"
|
#include "objectinterface.h"
|
||||||
#include "PlatformUtils/src/utils.h"
|
#include "PlatformUtils/src/utils.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
AkVCam::ObjectInterface::ObjectInterface():
|
AkVCam::ObjectInterface::ObjectInterface():
|
||||||
m_objectID(0),
|
m_objectID(0),
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include "PlatformUtils/src/preferences.h"
|
#include "PlatformUtils/src/preferences.h"
|
||||||
#include "PlatformUtils/src/utils.h"
|
#include "PlatformUtils/src/utils.h"
|
||||||
#include "VCamUtils/src/ipcbridge.h"
|
#include "VCamUtils/src/ipcbridge.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
extern "C" void *akPluginMain(CFAllocatorRef allocator,
|
extern "C" void *akPluginMain(CFAllocatorRef allocator,
|
||||||
CFUUIDRef requestedTypeUUID)
|
CFUUIDRef requestedTypeUUID)
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "PlatformUtils/src/utils.h"
|
#include "PlatformUtils/src/utils.h"
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/ipcbridge.h"
|
#include "VCamUtils/src/ipcbridge.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include "PlatformUtils/src/utils.h"
|
#include "PlatformUtils/src/utils.h"
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/image/videoframe.h"
|
#include "VCamUtils/src/image/videoframe.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include "service.h"
|
#include "service.h"
|
||||||
#include "PlatformUtils/src/preferences.h"
|
#include "PlatformUtils/src/preferences.h"
|
||||||
#include "PlatformUtils/src/utils.h"
|
#include "PlatformUtils/src/utils.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/image/videoframe.h"
|
#include "VCamUtils/src/image/videoframe.h"
|
||||||
#include "VCamUtils/src/timer.h"
|
#include "VCamUtils/src/timer.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
|
|
||||||
#include "messageserver.h"
|
#include "messageserver.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include "preferences.h"
|
#include "preferences.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
#define REG_PREFIX "SOFTWARE\\Webcamoid\\VirtualCamera\\"
|
#define REG_PREFIX "SOFTWARE\\Webcamoid\\VirtualCamera\\"
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include "sharedmemory.h"
|
#include "sharedmemory.h"
|
||||||
#include "mutex.h"
|
#include "mutex.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <strmif.h>
|
#include <strmif.h>
|
||||||
|
|
||||||
#include "VCamUtils/src/image/videoformattypes.h"
|
#include "VCamUtils/src/image/videoformattypes.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
#define AkLogInterface(interface, instance) \
|
#define AkLogInterface(interface, instance) \
|
||||||
AkLogInfo() << "Returning " << #interface << "(" << instance << ")" << std::endl
|
AkLogInfo() << "Returning " << #interface << "(" << instance << ")" << std::endl
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include "VCamUtils/src/image/videoformat.h"
|
#include "VCamUtils/src/image/videoformat.h"
|
||||||
#include "VCamUtils/src/image/videoframe.h"
|
#include "VCamUtils/src/image/videoframe.h"
|
||||||
#include "VCamUtils/src/ipcbridge.h"
|
#include "VCamUtils/src/ipcbridge.h"
|
||||||
#include "VCamUtils/src/logger/logger.h"
|
#include "VCamUtils/src/logger.h"
|
||||||
|
|
||||||
namespace AkVCam
|
namespace AkVCam
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue