merge with master and fix 4 conflicts by hand

[ardour.git] / libs / surfaces / control_protocol / control_protocol / basic_ui.h

diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index 9bbfe659796f820dc77a55cdaf859bcb38a87e58..277a7f8ecdc505e2679c8ebfb26898a2270988af 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -28,25 +28,16 @@
 
 #include "ardour/types.h"
 
-#include <jack/types.h>
-
 #include "timecode/time.h"
 
-#include "ardour/visibility.h"
+#include "control_protocol/visibility.h"
 
 namespace ARDOUR {
        class Session;
        class SessionEvent;
 }
 
-#ifdef ARDOURCP_DLL_EXPORTS // defined if we are building the ARDOUR Control Protocol DLL (instead of using it)
-    #define ARDOURCP_API LIBARDOUR_HELPER_DLL_EXPORT
-#else
-    #define ARDOURCP_API LIBARDOUR_HELPER_DLL_IMPORT
-#endif 
-#define ARDOURCP_LOCAL LIBARDOUR_HELPER_DLL_LOCAL
-
-class ARDOURCP_API BasicUI {
+class LIBCONTROLCP_API BasicUI {
   public:
        BasicUI (ARDOUR::Session&);
        virtual ~BasicUI ();