X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2Fcontrol_protocol%2Fbasic_ui.h;h=180688e61603dc747c2194bd5fe1aa2c65f7eb6b;hb=d15fda6d751a465d278f477923075d4783f3b1ca;hp=c8b5a2a0b65102f26872e6674df59c74c6bf6fae;hpb=68e943265edf04e63a8e8b8f62bab20f99d9c637;p=ardour.git

diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
index c8b5a2a0b6..180688e616 100644
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -22,20 +22,29 @@
 #define __ardour_basic_ui_h__
 
 #include <string>
+#include <stdint.h>
+
+#include "pbd/signals.h"
+
+#include "ardour/types.h"
 
 #include <jack/types.h>
-#include <control_protocol/smpte.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);
 
@@ -43,18 +52,18 @@ class BasicUI {
 
 	void loop_toggle ();
 	void access_action ( std::string action_path );
-	static sigc::signal<void,std::string,std::string> AccessAction;
+	static PBD::Signal2<void,std::string,std::string> AccessAction;
 	void goto_start ();
 	void goto_end ();
 	void rewind ();
 	void ffwd ();
 	void transport_stop ();
 	void transport_play (bool jump_back = true);
-	void set_transport_speed (float speed);
-	float get_transport_speed ();
+	void set_transport_speed (double speed);
+	double get_transport_speed ();
 
-	jack_nframes_t transport_frame ();
-	void locate (jack_nframes_t frame, bool play = false);
+	ARDOUR::framepos_t transport_frame ();
+	void locate (ARDOUR::framepos_t frame, bool play = false);
 	bool locating ();
 	bool locked ();
 
@@ -72,11 +81,11 @@ class BasicUI {
 	void rec_enable_toggle ();
 	void toggle_all_rec_enables ();
 
-	jack_nframes_t smpte_frames_per_hour ();
+	ARDOUR::framecnt_t timecode_frames_per_hour ();
 
-	void smpte_time (jack_nframes_t where, SMPTE::Time&);
-	void smpte_to_sample (SMPTE::Time& smpte, jack_nframes_t& sample, bool use_offset, bool use_subframes) const;
-	void sample_to_smpte (jack_nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const;
+	void timecode_time (framepos_t where, Timecode::Time&);
+	void timecode_to_sample (Timecode::Time& timecode, framepos_t & sample, bool use_offset, bool use_subframes) const;
+	void sample_to_timecode (framepos_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const;
 
   protected:
 	BasicUI ();