fix merge errors 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 f555ed326a63a9d8e85e84feee670a23293dc098..180688e61603dc747c2194bd5fe1aa2c65f7eb6b 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -30,19 +30,21 @@
 
 #include <jack/types.h>
 
-#include "musictime/time.h"
+#include "timecode/time.h"
+
+#include "control_protocol/visibility.h"
 
 namespace ARDOUR {
        class Session;
        class SessionEvent;
 }
 
-class BasicUI {
+class LIBCONTROLCP_API BasicUI {
   public:
        BasicUI (ARDOUR::Session&);
        virtual ~BasicUI ();
        
-       void add_marker ();
+       void add_marker (const std::string& = std::string());
 
        void register_thread (std::string name);