merge (w/fix) with master

[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..180688e61603dc747c2194bd5fe1aa2c65f7eb6b 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -32,21 +32,14 @@
 
 #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 ();