X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2Fbasic_ui.cc;h=98e7adf949b7082812062c4f82d4553379603111;hb=bebe2af95ad9999fdca719450dc2c70cfb849076;hp=47401c8cfe896dd9974cc7405a004e8312d155c4;hpb=ab6f1ed9bafa869648b6e94ee5186ff317b32c3e;p=ardour.git

diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index 47401c8cfe..98e7adf949 100644
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -16,20 +16,22 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
-#include <pbd/pthread_utils.h>
+#include "pbd/pthread_utils.h"
+#include "pbd/memento_command.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"
 
 using namespace ARDOUR;
 
+PBD::Signal2<void,std::string,std::string> BasicUI::AccessAction;
+
 BasicUI::BasicUI (Session& s)
 	: session (&s)
 {
@@ -48,16 +50,29 @@ 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 ) 
+{
+	int split_at = action_path.find( "/" );
+	std::string group = action_path.substr( 0, split_at );
+	std::string item = action_path.substr( split_at + 1 );
+
+	AccessAction( group, item );
 }
 
 void
 BasicUI::loop_toggle () 
 {
-	if (session->get_auto_loop()) {
-		session->request_auto_loop (false);
+	if (session->get_play_loop()) {
+		session->request_play_loop (false);
 	} else {
-		session->request_auto_loop (true);
+		session->request_play_loop (true);
 		if (!session->transport_rolling()) {
 			session->request_transport_speed (1.0);
 		}
@@ -77,22 +92,28 @@ BasicUI::goto_end ()
 }
 
 void       
-BasicUI::add_marker ()
+BasicUI::add_marker (const std::string& markername)
 {
-	jack_nframes_t when = session->audible_frame();
-	session->locations()->add (new Location (when, when, _("unnamed"), Location::IsMark));
+	framepos_t where = session->audible_frame();
+	Location *location = new Location (*session, where, where, markername, Location::IsMark);
+	session->begin_reversible_command (_("add marker"));
+	XMLNode &before = session->locations()->get_state();
+	session->locations()->add (location, true);
+	XMLNode &after = session->locations()->get_state();
+	session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+	session->commit_reversible_command ();
 }
 
 void
 BasicUI::rewind ()
 {
-	session->request_transport_speed (-2.0f);
+	session->request_transport_speed (session->transport_speed() - 1.5);
 }
 
 void
 BasicUI::ffwd ()
 {
-	session->request_transport_speed (2.0f);
+	session->request_transport_speed (session->transport_speed() + 1.5);
 }
 
 void
@@ -106,12 +127,12 @@ BasicUI::transport_play (bool from_last_start)
 {
 	bool rolling = session->transport_rolling ();
 
-	if (session->get_auto_loop()) {
-		session->request_auto_loop (false);
+	if (session->get_play_loop()) {
+		session->request_play_loop (false);
 	} 
 
 	if (session->get_play_range ()) {
-		session->request_play_range (false);
+		session->request_play_range (0);
 	}
 	
 	if (from_last_start && rolling) {
@@ -145,16 +166,15 @@ void
 BasicUI::save_state ()
 {
 	session->save_state ("");
-        session->save_history();
 }
 
 void
 BasicUI::prev_marker ()
 {
-	Location *location = session->locations()->first_location_before (session->transport_frame());
+	framepos_t pos = session->locations()->first_mark_before (session->transport_frame());
 	
-	if (location) {
-		session->request_locate (location->start(), session->transport_rolling());
+	if (pos >= 0) {
+		session->request_locate (pos, session->transport_rolling());
 	} else {
 		session->goto_start ();
 	}
@@ -163,22 +183,22 @@ BasicUI::prev_marker ()
 void
 BasicUI::next_marker ()
 {
-	Location *location = session->locations()->first_location_after (session->transport_frame());
+	framepos_t pos = session->locations()->first_mark_after (session->transport_frame());
 
-	if (location) {
-		session->request_locate (location->start(), session->transport_rolling());
+	if (pos >= 0) {
+		session->request_locate (pos, session->transport_rolling());
 	} else {
-		session->request_locate (session->current_end_frame());
+		session->goto_end();
 	}
 }
 
 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 ();
@@ -200,22 +220,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 ()
 {
-	session->set_punch_in (!session->get_punch_in());
+	session->config.set_punch_in (!session->config.get_punch_in());
 }
 
 void
 BasicUI::toggle_punch_out ()
 {
-	session->set_punch_out (!session->get_punch_out());
+	session->config.set_punch_out (!session->config.get_punch_out());
 }
 
 bool
@@ -234,14 +254,14 @@ BasicUI::set_record_enable (bool yn)
 	}
 }
 
-jack_nframes_t
+framepos_t
 BasicUI::transport_frame ()
 {
 	return session->transport_frame();
 }
 
 void
-BasicUI::locate (jack_nframes_t where, bool roll_after_locate)
+BasicUI::locate (framepos_t where, bool roll_after_locate)
 {
 	session->request_locate (where, roll_after_locate);
 }
@@ -258,26 +278,122 @@ BasicUI::locked ()
 	return session->transport_locked ();
 }
 
-jack_nframes_t
-BasicUI::smpte_frames_per_hour ()
+ARDOUR::framecnt_t
+BasicUI::timecode_frames_per_hour ()
 {
-	return session->smpte_frames_per_hour ();
+	return session->timecode_frames_per_hour ();
 }
 
 void
-BasicUI::smpte_time (jack_nframes_t where, SMPTE::Time& smpte)
+BasicUI::timecode_time (framepos_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, jack_nframes_t& sample, bool use_offset, bool use_subframes) const
+BasicUI::timecode_to_sample (Timecode::Time& timecode, framepos_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 (jack_nframes_t sample, SMPTE::Time& smpte, bool use_offset, bool use_subframes) const
+BasicUI::sample_to_timecode (framepos_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);
+}
+
+#if 0
+this stuff is waiting to go in so that all UIs can offer complex solo/mute functionality
+
+void
+BasicUI::solo_release (boost::shared_ptr<Route> r)
+{
+}
+
+void
+BasicUI::solo_press (boost::shared_ptr<Route> r, bool momentary, bool global, bool exclusive, bool isolate, bool solo_group)
+{
+	if (momentary) {
+		_solo_release = new SoloMuteRelease (_route->soloed());
+	}
+	
+	if (global) {
+		
+		if (_solo_release) {
+			_solo_release->routes = _session->get_routes ();
+		}
+		
+		if (Config->get_solo_control_is_listen_control()) {
+			_session->set_listen (_session->get_routes(), !_route->listening(),  Session::rt_cleanup, true);
+		} else {
+			_session->set_solo (_session->get_routes(), !_route->soloed(),  Session::rt_cleanup, true);
+		}
+		
+	} else if (exclusive) {
+		
+		if (_solo_release) {
+			_solo_release->exclusive = true;
+			
+			boost::shared_ptr<RouteList> routes = _session->get_routes();
+			
+			for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
+				if ((*i)->soloed ()) {
+					_solo_release->routes_on->push_back (*i);
+				} else {
+					_solo_release->routes_off->push_back (*i);
+				}
+			}
+		}
+		
+		if (Config->get_solo_control_is_listen_control()) {
+			/* ??? we need a just_one_listen() method */
+		} else {
+			_session->set_just_one_solo (_route, true);
+		}
+		
+	} else if (isolate) {
+		
+		// shift-click: toggle solo isolated status
+		
+		_route->set_solo_isolated (!_route->solo_isolated(), this);
+		delete _solo_release;
+		_solo_release = 0;
+		
+	} else if (solo_group) {
+		
+		/* Primary-button1: solo mix group.
+		   NOTE: Primary-button2 is MIDI learn.
+		*/
+		
+		if (_route->route_group()) {
+			
+			if (_solo_release) {
+				_solo_release->routes = _route->route_group()->route_list();
+			}
+			
+			if (Config->get_solo_control_is_listen_control()) {
+				_session->set_listen (_route->route_group()->route_list(), !_route->listening(),  Session::rt_cleanup, true);
+			} else {
+				_session->set_solo (_route->route_group()->route_list(), !_route->soloed(),  Session::rt_cleanup, true);
+			}
+		}
+		
+	} else {
+		
+		/* click: solo this route */
+		
+		boost::shared_ptr<RouteList> rl (new RouteList);
+		rl->push_back (route());
+		
+		if (_solo_release) {
+			_solo_release->routes = rl;
+		}
+		
+		if (Config->get_solo_control_is_listen_control()) {
+			_session->set_listen (rl, !_route->listening());
+		} else {
+			_session->set_solo (rl, !_route->soloed());
+		}
+	}
 }
+#endif