major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI...

[ardour.git] / libs / surfaces / control_protocol / basic_ui.cc

diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index 71d579480589e050d59ee253ee539d7e9b637b3e..d53c44b0a87b9a800c21d942e4b8b883cd506386 100644 (file)
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -18,12 +18,12 @@
 
 */
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
 
-#include <ardour/session.h>
-#include <ardour/location.h>
+#include "ardour/session.h"
+#include "ardour/location.h"
 
-#include <control_protocol/basic_ui.h>
+#include "control_protocol/basic_ui.h"
 
 #include "i18n.h"
 
@@ -50,9 +50,11 @@ BasicUI::~BasicUI ()
 void
 BasicUI::register_thread (std::string name)
 {
-       PBD::ThreadCreated (pthread_self(), name);
-}
+       std::string pool_name = name;
+       pool_name += " events";
 
+       SessionEvent::create_per_thread_pool (pool_name, 64);
+}
 
 void
 BasicUI::access_action ( std::string action_path ) 
@@ -185,12 +187,12 @@ BasicUI::next_marker ()
 }
 
 void
-BasicUI::set_transport_speed (float speed)
+BasicUI::set_transport_speed (double speed)
 {
        session->request_transport_speed (speed);
 }
 
-float
+double
 BasicUI::get_transport_speed ()
 {
        return session->transport_speed ();
@@ -212,22 +214,22 @@ void
 BasicUI::toggle_all_rec_enables ()
 {
        if (session->get_record_enabled()) {
-               session->record_disenable_all ();
+               // session->record_disenable_all ();
        } else {
-               session->record_enable_all ();
+               // session->record_enable_all ();
        }
 }
 
 void
 BasicUI::toggle_punch_in ()
 {
-       Config->set_punch_in (!Config->get_punch_in());
+       session->config.set_punch_in (!session->config.get_punch_in());
 }
 
 void
 BasicUI::toggle_punch_out ()
 {
-       Config->set_punch_out (!Config->get_punch_out());
+       session->config.set_punch_out (!session->config.get_punch_out());
 }
 
 bool
@@ -271,25 +273,25 @@ BasicUI::locked ()
 }
 
 nframes_t
-BasicUI::smpte_frames_per_hour ()
+BasicUI::timecode_frames_per_hour ()
 {
-       return session->smpte_frames_per_hour ();
+       return session->timecode_frames_per_hour ();
 }
 
 void
-BasicUI::smpte_time (nframes_t where, SMPTE::Time& smpte)
+BasicUI::timecode_time (nframes_t where, Timecode::Time& timecode)
 {
-       session->smpte_time (where, *((SMPTE::Time *) &smpte));
+       session->timecode_time (where, *((Timecode::Time *) &timecode));
 }
 
 void 
-BasicUI::smpte_to_sample (SMPTE::Time& smpte, nframes_t& sample, bool use_offset, bool use_subframes) const
+BasicUI::timecode_to_sample (Timecode::Time& timecode, nframes_t& sample, bool use_offset, bool use_subframes) const
 {
-       session->smpte_to_sample (*((SMPTE::Time*)&smpte), sample, use_offset, use_subframes);
+       session->timecode_to_sample (*((Timecode::Time*)&timecode), sample, use_offset, use_subframes);
 }
 
 void 
-BasicUI::sample_to_smpte (nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const
+BasicUI::sample_to_timecode (nframes_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const
 {
-       session->sample_to_smpte (sample, *((SMPTE::Time*)&smpte), use_offset, use_subframes);
+       session->sample_to_timecode (sample, *((Timecode::Time*)&timecode), use_offset, use_subframes);
 }