try some rearrangement to fix old mingw builds

5 files changed, 15 insertions, 6 deletions

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index fb522466d8..4e71100e5b 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -73,7 +73,6 @@
 #include "mackie_control_exception.h"
 #include "device_profile.h"
 #include "subview.h"
-#include "subview_modes.h"
 #include "surface_port.h"
 #include "surface.h"
 #include "strip.h"
diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h
index 0487e11753..4a23e770a0 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.h
+++ b/libs/surfaces/mackie/mackie_control_protocol.h
@@ -46,7 +46,7 @@
 #include "timer.h"
 #include "device_info.h"
 #include "device_profile.h"
-#include "subview_modes.h"
+#include "subview.h"
 
 namespace ARDOUR {
 	class AutomationControl;
@@ -60,7 +60,6 @@ namespace MIDI {
 namespace ArdourSurface {
 
 namespace Mackie {
-	class Subview;
 	class Surface;
 	class Control;
 	class SurfacePort;
diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 7d79231b30..d126ebe22a 100644
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -60,7 +60,6 @@
 
 #include "mackie_control_protocol.h"
 #include "subview.h"
-#include "subview_modes.h"
 #include "surface_port.h"
 #include "surface.h"
 #include "strip.h"
diff --git a/libs/surfaces/mackie/subview.cc b/libs/surfaces/mackie/subview.cc
index 6f88d5a962..65ec570862 100644
--- a/libs/surfaces/mackie/subview.cc
+++ b/libs/surfaces/mackie/subview.cc
@@ -40,7 +40,6 @@
 #include "pot.h"
 #include "strip.h"
 #include "subview.h"
-#include "subview_modes.h"
 #include "surface.h"
 
 using namespace ARDOUR;
diff --git a/libs/surfaces/mackie/subview.h b/libs/surfaces/mackie/subview.h
index 5eee4cb550..9c214726e8 100644
--- a/libs/surfaces/mackie/subview.h
+++ b/libs/surfaces/mackie/subview.h
@@ -24,7 +24,11 @@
 
 #include "ardour/types.h"
 
-#include "subview_modes.h"
+namespace ARDOUR {
+	class ParameterDescriptor;
+	class Plugin;
+	class PluginInsert;
+}
 
 namespace ArdourSurface {
 
@@ -37,6 +41,15 @@ class Strip;
 class Subview;
 class Surface;
 
+enum SubViewMode {
+	None,
+	EQ,
+	Dynamics,
+	Sends,
+	TrackView,
+	Plugin,
+};
+
 class SubviewFactory {
   public:
 	static SubviewFactory* instance();