X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2Fbasic_ui.cc;h=9d55b3ac53db3573da1dd89612ff97be0b839500;hb=11b0ac77f5c3b1e5bd2a96218d05edbe12a740db;hp=3dc93cc64ad980070886d6215a613b25a5288260;hpb=25d1670a61d19e795227b939a98be9cf5a050c67;p=ardour.git diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index 3dc93cc64a..9d55b3ac53 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -16,20 +16,21 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ -#include +#include "pbd/pthread_utils.h" -#include -#include +#include "ardour/session.h" +#include "ardour/location.h" -#include +#include "control_protocol/basic_ui.h" #include "i18n.h" using namespace ARDOUR; +PBD::Signal2 BasicUI::AccessAction; + BasicUI::BasicUI (Session& s) : session (&s) { @@ -48,16 +49,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); } @@ -79,8 +93,8 @@ BasicUI::goto_end () void BasicUI::add_marker () { - jack_nframes_t when = session->audible_frame(); - session->locations()->add (new Location (when, when, _("unnamed"), Location::IsMark)); + framepos_t when = session->audible_frame(); + session->locations()->add (new Location (*session, when, when, _("unnamed"), Location::IsMark)); } void @@ -106,12 +120,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) { @@ -172,12 +186,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 (); @@ -199,22 +213,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 @@ -233,14 +247,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); } @@ -257,26 +271,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 r) +{ +} + +void +BasicUI::solo_press (boost::shared_ptr 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 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 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