From 2230b5099fdba6cbfed59c3d1cdd041952db880c Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Tue, 1 Dec 2020 21:13:31 +0100
Subject: [PATCH] Move logger to common/logging/common.h

---
 meson.build                                    | 6 +++---
 src/common/communication/common.h              | 2 +-
 src/common/communication/vst2.h                | 2 +-
 src/common/{logging.cpp => logging/common.cpp} | 4 +---
 src/common/{logging.h => logging/common.h}     | 2 +-
 src/plugin/bridges/vst2.h                      | 2 +-
 src/plugin/host-process.h                      | 2 +-
 src/plugin/vst2-plugin.cpp                     | 2 +-
 src/wine-host/bridges/vst2.h                   | 2 +-
 9 files changed, 11 insertions(+), 13 deletions(-)
 rename src/common/{logging.cpp => logging/common.cpp} (99%)
 rename src/common/{logging.h => logging/common.h} (99%)

diff --git a/meson.build b/meson.build
index 2fa69ec7..d488a3d1 100644
--- a/meson.build
+++ b/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',
diff --git a/src/common/communication/common.h b/src/common/communication/common.h
index 08349eb2..c4757296 100644
--- a/src/common/communication/common.h
+++ b/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>;
diff --git a/src/common/communication/vst2.h b/src/common/communication/vst2.h
index da713612..f0476355 100644
--- a/src/common/communication/vst2.h
+++ b/src/common/communication/vst2.h
@@ -18,7 +18,7 @@
 
 #include <atomic>
 
-#include "../logging.h"
+#include "../logging/common.h"
 #include "common.h"
 
 /**
diff --git a/src/common/logging.cpp b/src/common/logging/common.cpp
similarity index 99%
rename from src/common/logging.cpp
rename to src/common/logging/common.cpp
index 98aa8300..d77891cb 100644
--- a/src/common/logging.cpp
+++ b/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.
diff --git a/src/common/logging.h b/src/common/logging/common.h
similarity index 99%
rename from src/common/logging.h
rename to src/common/logging/common.h
index 8ce0a8e8..06390ef2 100644
--- a/src/common/logging.h
+++ b/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
diff --git a/src/plugin/bridges/vst2.h b/src/plugin/bridges/vst2.h
index 33faeb98..45c9e3d2 100644
--- a/src/plugin/bridges/vst2.h
+++ b/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"
 
 /**
diff --git a/src/plugin/host-process.h b/src/plugin/host-process.h
index 443c0eb8..c1196b25 100644
--- a/src/plugin/host-process.h
+++ b/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"
 
diff --git a/src/plugin/vst2-plugin.cpp b/src/plugin/vst2-plugin.cpp
index 75a860f2..50c17c4c 100644
--- a/src/plugin/vst2-plugin.cpp
+++ b/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")))
diff --git a/src/wine-host/bridges/vst2.h b/src/wine-host/bridges/vst2.h
index 9ddfe3b0..11014889 100644
--- a/src/wine-host/bridges/vst2.h
+++ b/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"