remove a couple of boost::signals2 trouble spots; fix some --strict compile time...

[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 23b274ca01f56fbc4080e6b1cc538e7d28dd3a9b..f1bfcaa87c7f43ce2057b2c4983ad26b1417c38c 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h
+++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h
@@ -16,19 +16,21 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_basic_ui_h__
 #define __ardour_basic_ui_h__
 
 #include <string>
+#include "pbd/signals.h"
 
 #include <jack/types.h>
-#include <control_protocol/smpte.h>
+
+#include "control_protocol/timecode.h"
 
 namespace ARDOUR {
        class Session;
+       class SessionEvent;
 }
 
 class BasicUI {
@@ -43,14 +45,16 @@ class BasicUI {
        /* transport control */
 
        void loop_toggle ();
+       void access_action ( std::string action_path );
+       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);
@@ -71,11 +75,11 @@ class BasicUI {
        void rec_enable_toggle ();
        void toggle_all_rec_enables ();
 
-       jack_nframes_t smpte_frames_per_hour ();
+       jack_nframes_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 (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;
 
   protected:
        BasicUI ();