Move logger to common/logging/common.h

meson.build

@@ -84,7 +84,7 @@ shared_library(
     'src/common/communication/vst2.cpp',
     'src/common/serialization/vst2.cpp',
     'src/common/configuration.cpp',
-    'src/common/logging.cpp',
+    'src/common/logging/common.cpp',
     'src/common/plugins.cpp',
     'src/common/utils.cpp',
     'src/plugin/bridges/vst2.cpp',
@@ -203,7 +203,7 @@ if with_vst3
   shared_library(
     'yabridge-vst3',
     [
-      'src/common/logging.cpp',
+      'src/common/logging/common.cpp',
       'src/plugin/vst3-plugin.cpp',
       version_header,
     ],
@@ -228,7 +228,7 @@ host_sources = [
   'src/common/communication/vst2.cpp',
   'src/common/serialization/vst2.cpp',
   'src/common/configuration.cpp',
-  'src/common/logging.cpp',
+  'src/common/logging/common.cpp',
   'src/common/plugins.cpp',
   'src/common/utils.cpp',
   'src/wine-host/bridges/vst2.cpp',

src/common/communication/common.h

@@ -28,7 +28,7 @@
 #include <boost/asio/write.hpp>
 #include <boost/filesystem.hpp>
 
-#include "../logging.h"
+#include "../logging/common.h"
 
 template <typename B>
 using OutputAdapter = bitsery::OutputBufferAdapter<B>;

src/common/communication/vst2.h

@@ -18,7 +18,7 @@
 
 #include <atomic>
 
-#include "../logging.h"
+#include "../logging/common.h"
 #include "common.h"
 
 /**

src/common/logging/common.cpp

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-#include "logging.h"
+#include "common.h"
 
 #ifdef __WINE__
 #include "../wine-host/boost-fix.h"
@@ -29,8 +29,6 @@
 #include <iomanip>
 #include <iostream>
 
-#include "vst24.h"
-
 /**
  * The environment variable indicating whether to log to a file. Will log to
  * STDERR if not specified.

src/common/logging/common.h

@@ -22,7 +22,7 @@
 
 // TODO: Split up the plugin API specific logging functions so we don't have to
 //       include a bunch of stuff we don't need
-#include "serialization/vst2.h"
+#include "../serialization/vst2.h"
 
 /**
  * Super basic logging facility meant for debugging malfunctioning VST

src/plugin/bridges/vst2.h

@@ -25,7 +25,7 @@
 
 #include "../../common/communication/vst2.h"
 #include "../../common/configuration.h"
-#include "../../common/logging.h"
+#include "../../common/logging/common.h"
 #include "../host-process.h"
 
 /**

src/plugin/host-process.h

@@ -26,7 +26,7 @@
 #include <thread>
 
 #include "../common/communication/common.h"
-#include "../common/logging.h"
+#include "../common/logging/common.h"
 #include "../common/plugins.h"
 #include "utils.h"
 

src/plugin/vst2-plugin.cpp

@@ -19,7 +19,7 @@
 #include <iostream>
 #include <memory>
 
-#include "../common/logging.h"
+#include "../common/logging/common.h"
 #include "bridges/vst2.h"
 
 #define VST_EXPORT __attribute__((visibility("default")))

src/wine-host/bridges/vst2.h

@@ -31,7 +31,7 @@
 
 #include "../../common/communication/vst2.h"
 #include "../../common/configuration.h"
-#include "../../common/logging.h"
+#include "../../common/logging/common.h"
 #include "../editor.h"
 #include "../utils.h"