From 22be57285522b008f64cbcd89184f8b4e3efa47c Mon Sep 17 00:00:00 2001 From: "Brigham Keys, Esq" Date: Mon, 1 Aug 2016 17:06:40 -0500 Subject: [PATCH] Made the code a bit less ugly --- cAudio/src/cAudio.cpp | 51 +++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/cAudio/src/cAudio.cpp b/cAudio/src/cAudio.cpp index 02233fb..711d3d5 100644 --- a/cAudio/src/cAudio.cpp +++ b/cAudio/src/cAudio.cpp @@ -30,22 +30,37 @@ namespace cAudio { - //--------------------------------------------------------------------------------------- - // Logger section - //--------------------------------------------------------------------------------------- +//--------------------------------------------------------------------------------------- +// Logger section +//--------------------------------------------------------------------------------------- #if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1 static cConsoleLogReceiver ConsoleLog; #endif #if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1 - // static cFileLogReceiver *FileLog = new cFileLogReceiver(); - static cFileLogReceiver *FileLog; + static cFileLogReceiver *FileLog; #endif - //--------------------------------------------------------------------------------------- - // Audio manager section - //--------------------------------------------------------------------------------------- + CAUDIO_API ILogger* getLogger() + { + static cLogger* Logger = NULL; + if(!Logger) + { + Logger = new cLogger; +#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1 + Logger->registerLogReceiver(&ConsoleLog, "Console"); +#endif +#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1 + Logger->registerLogReceiver(FileLog,"File"); +#endif + } + return Logger; + } + +//--------------------------------------------------------------------------------------- +// Audio manager section +//--------------------------------------------------------------------------------------- #if CAUDIO_COMPILE_WITH_OGG_DECODER == 1 static cOggAudioDecoderFactory OggDecoderFactory; @@ -112,26 +127,6 @@ namespace cAudio } } - ////////////////////////////////////////// - - CAUDIO_API ILogger* getLogger() - { - static cLogger* Logger = NULL; - if(!Logger) - { - Logger = new cLogger; -#if CAUDIO_COMPILE_WITH_CONSOLE_LOG_RECEIVER == 1 - Logger->registerLogReceiver(&ConsoleLog, "Console"); -#endif -#if CAUDIO_COMPILE_WITH_FILE_LOG_RECEIVER == 1 - Logger->registerLogReceiver(FileLog,"File"); -#endif - } - return Logger; - } - - - //--------------------------------------------------------------------------------------- // Audio capture section //---------------------------------------------------------------------------------------