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 cae9c23ae95d1bed3d9f13533401fb4889cc976a..277a7f8ecdc505e2679c8ebfb26898a2270988af 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -22,20 +22,27 @@
 #define __ardour_basic_ui_h__
 
 #include <string>
+#include <stdint.h>
 
-#include <jack/types.h>
-#include "control_protocol/timecode.h"
+#include "pbd/signals.h"
+
+#include "ardour/types.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,7 +50,7 @@ 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 ();
@@ -53,8 +60,8 @@ class BasicUI {
        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 +79,11 @@ class BasicUI {
        void rec_enable_toggle ();
        void toggle_all_rec_enables ();
 
-       jack_nframes_t timecode_frames_per_hour ();
+       ARDOUR::framecnt_t timecode_frames_per_hour ();
 
-       void timecode_time (jack_nframes_t where, Timecode::Time&);
-       void timecode_to_sample (Timecode::Time& timecode, jack_nframes_t& sample, bool use_offset, bool use_subframes) const;
-       void sample_to_timecode (jack_nframes_t sample, Timecode::Time& timecode, 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 ();