X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_ui.cc;h=bdbdd11591563b860589b568e49c57447907138b;hb=f1b0f30cd5d72e16084e4f4305e4bb5877311b2c;hp=f2333141885fa63fc0e96cff5eb020fca82bd33d;hpb=90d6916ca3443b81a4eaf615c014ac065554b4f2;p=ardour.git diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index f233314188..bdbdd11591 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -29,7 +29,6 @@ #include "ardour/dB.h" #include "pbd/memento_command.h" #include "pbd/stacktrace.h" -#include "pbd/shiva.h" #include "pbd/controllable.h" #include "pbd/enumwriter.h" @@ -60,19 +59,18 @@ #include "ardour/profile.h" #include "i18n.h" -using namespace sigc; using namespace Gtk; using namespace Gtkmm2ext; using namespace ARDOUR; using namespace PBD; -RouteUI::RouteUI (ARDOUR::Session& sess) +RouteUI::RouteUI (ARDOUR::Session* sess) : AxisView(sess) { init (); } -RouteUI::RouteUI (boost::shared_ptr rt, ARDOUR::Session& sess) +RouteUI::RouteUI (boost::shared_ptr rt, ARDOUR::Session* sess) : AxisView(sess) { init (); @@ -81,9 +79,8 @@ RouteUI::RouteUI (boost::shared_ptr rt, ARDOUR::Session& sess) RouteUI::~RouteUI() { - /* derived classes should emit GoingAway so that they receive the signal - when the object is still a legal derived instance. - */ + _route.reset (); /* drop reference to route, so that it can be cleaned up */ + route_connections.drop_connections (); delete solo_menu; delete mute_menu; @@ -138,21 +135,28 @@ RouteUI::init () show_sends_button->set_self_managed (true); UI::instance()->set_tip (show_sends_button, _("make mixer strips show sends to this bus"), ""); - _session.SoloChanged.connect (mem_fun(*this, &RouteUI::solo_changed_so_update_mute)); - _session.TransportStateChange.connect (mem_fun (*this, &RouteUI::check_rec_enable_sensitivity)); + _session->SoloChanged.connect (_session_connections, boost::bind (&RouteUI::solo_changed_so_update_mute, this), gui_context()); + _session->TransportStateChange.connect (_session_connections, boost::bind (&RouteUI::check_rec_enable_sensitivity, this), gui_context()); + _session->RecordStateChanged.connect (_session_connections, boost::bind (&RouteUI::session_rec_enable_changed, this), gui_context()); - Config->ParameterChanged.connect (mem_fun (*this, &RouteUI::parameter_changed)); + Config->ParameterChanged.connect (*this, ui_bind (&RouteUI::parameter_changed, this, _1), gui_context()); + + rec_enable_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_press), false); + rec_enable_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::rec_enable_release), false); + + show_sends_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_press), false); + show_sends_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::show_sends_release)); + + solo_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::solo_press), false); + solo_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::solo_release), false); + mute_button->signal_button_press_event().connect (sigc::mem_fun(*this, &RouteUI::mute_press), false); + mute_button->signal_button_release_event().connect (sigc::mem_fun(*this, &RouteUI::mute_release), false); } void RouteUI::reset () { - //Remove route connections associated with us. - for (vector::iterator it = connections.begin(); it!=connections.end(); ++it) { - (*it).disconnect(); - } - - connections.clear (); + route_connections.drop_connections (); delete solo_menu; solo_menu = 0; @@ -170,6 +174,14 @@ RouteUI::reset () denormal_menu_item = 0; } +void +RouteUI::self_delete () +{ + /* This may be called from a non-GUI thread. Keep it safe */ + + delete_when_idle (this); +} + void RouteUI::set_route (boost::shared_ptr rp) { @@ -181,28 +193,24 @@ RouteUI::set_route (boost::shared_ptr rp) set_color (unique_random_color()); } - /* no, there is no memory leak here. This object cleans itself (and other stuff) - up when the route is destroyed. - */ - if (self_destruct) { - new PairedShiva (*_route, *this); + rp->DropReferences.connect (route_connections, boost::bind (&RouteUI::self_delete, this), gui_context()); } - + mute_button->set_controllable (_route->mute_control()); solo_button->set_controllable (_route->solo_control()); - connections.push_back (_route->active_changed.connect (mem_fun (*this, &RouteUI::route_active_changed))); - connections.push_back (_route->mute_changed.connect (mem_fun(*this, &RouteUI::mute_changed))); - connections.push_back (_route->solo_changed.connect (mem_fun(*this, &RouteUI::solo_changed))); - connections.push_back (_route->listen_changed.connect (mem_fun(*this, &RouteUI::listen_changed))); - connections.push_back (_route->solo_isolated_changed.connect (mem_fun(*this, &RouteUI::solo_changed))); + _route->active_changed.connect (route_connections, boost::bind (&RouteUI::route_active_changed, this), gui_context()); + _route->mute_changed.connect (route_connections, ui_bind (&RouteUI::mute_changed, this, _1), gui_context()); + _route->solo_changed.connect (route_connections, ui_bind (&RouteUI::solo_changed, this, _1), gui_context()); + _route->listen_changed.connect (route_connections, ui_bind (&RouteUI::listen_changed, this, _1), gui_context()); + _route->solo_isolated_changed.connect (route_connections, ui_bind (&RouteUI::solo_changed, this, _1), gui_context()); + _route->PropertyChanged.connect (route_connections, ui_bind (&RouteUI::property_changed, this, _1), gui_context()); - if (_session.writable() && is_track()) { + if (_session->writable() && is_track()) { boost::shared_ptr t = boost::dynamic_pointer_cast(_route); - connections.push_back (t->diskstream()->RecordEnableChanged.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed))); - connections.push_back (_session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed))); + t->diskstream()->RecordEnableChanged.connect (route_connections, boost::bind (&RouteUI::route_rec_enable_changed, this), gui_context()); rec_enable_button->show(); rec_enable_button->set_controllable (t->rec_enable_control()); @@ -215,7 +223,7 @@ RouteUI::set_route (boost::shared_ptr rp) mute_button->show(); - if (_route->is_control()) { + if (_route->is_monitor()) { solo_button->hide (); } else { solo_button->show(); @@ -254,9 +262,10 @@ RouteUI::mute_press (GdkEventButton* ev) // Primary-button2 click is the midi binding click // button2-click is "momentary" - if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - return false; - } + + if (mute_button->on_button_press_event (ev)) { + return true; + } _mute_release = new SoloMuteRelease (_route->muted ()); } @@ -266,10 +275,10 @@ RouteUI::mute_press (GdkEventButton* ev) if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { if (_mute_release) { - _mute_release->routes = _session.get_routes (); + _mute_release->routes = _session->get_routes (); } - _session.set_mute (_session.get_routes(), !_route->muted()); + _session->set_mute (_session->get_routes(), !_route->muted()); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { @@ -279,10 +288,10 @@ RouteUI::mute_press (GdkEventButton* ev) if (ev->button == 1 && _route->route_group()) { if (_mute_release) { - _mute_release->routes = _session.get_routes (); + _mute_release->routes = _session->get_routes (); } - _session.set_mute (_session.get_routes(), !_route->muted(), Session::rt_cleanup, true); + _session->set_mute (_session->get_routes(), !_route->muted(), Session::rt_cleanup, true); } } else { @@ -296,7 +305,7 @@ RouteUI::mute_press (GdkEventButton* ev) _mute_release->routes = rl; } - _session.set_mute (rl, !_route->muted()); + _session->set_mute (rl, !_route->muted()); } } @@ -312,7 +321,7 @@ RouteUI::mute_release (GdkEventButton*) { if (!ignore_toggle) { if (_mute_release){ - _session.set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, true); + _session->set_mute (_mute_release->routes, _mute_release->active, Session::rt_cleanup, true); delete _mute_release; _mute_release = 0; } @@ -349,9 +358,9 @@ RouteUI::solo_press(GdkEventButton* ev) // Primary-button2 click is the midi binding click // button2-click is "momentary" - if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - return false; - } + if (solo_button->on_button_press_event (ev)) { + return true; + } _solo_release = new SoloMuteRelease (_route->soloed()); } @@ -363,13 +372,13 @@ RouteUI::solo_press(GdkEventButton* ev) /* Primary-Tertiary-click applies change to all routes */ if (_solo_release) { - _solo_release->routes = _session.get_routes (); + _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); + _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); + _session->set_solo (_session->get_routes(), !_route->soloed(), Session::rt_cleanup, true); } } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) { @@ -379,7 +388,7 @@ RouteUI::solo_press(GdkEventButton* ev) if (_solo_release) { _solo_release->exclusive = true; - boost::shared_ptr routes = _session.get_routes(); + boost::shared_ptr routes = _session->get_routes(); for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i)->soloed ()) { @@ -393,7 +402,7 @@ RouteUI::solo_press(GdkEventButton* ev) if (Config->get_solo_control_is_listen_control()) { /* ??? we need a just_one_listen() method */ } else { - _session.set_just_one_solo (_route, true); + _session->set_just_one_solo (_route, true); } } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { @@ -417,9 +426,9 @@ RouteUI::solo_press(GdkEventButton* ev) } if (Config->get_solo_control_is_listen_control()) { - _session.set_listen (_route->route_group()->route_list(), !_route->listening(), Session::rt_cleanup, true); + _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); + _session->set_solo (_route->route_group()->route_list(), !_route->soloed(), Session::rt_cleanup, true); } } @@ -435,9 +444,9 @@ RouteUI::solo_press(GdkEventButton* ev) } if (Config->get_solo_control_is_listen_control()) { - _session.set_listen (rl, !_route->listening()); + _session->set_listen (rl, !_route->listening()); } else { - _session.set_solo (rl, !_route->soloed()); + _session->set_solo (rl, !_route->soloed()); } } } @@ -457,7 +466,11 @@ RouteUI::solo_release (GdkEventButton*) if (_solo_release->exclusive) { } else { - _session.set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true); + if (Config->get_solo_control_is_listen_control()) { + _session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true); + } else { + _session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, true); + } } delete _solo_release; @@ -475,7 +488,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) return true; } - if (!_session.engine().connected()) { + if (!_session->engine().connected()) { MessageDialog msg (_("Not connected to JACK - cannot engage record")); msg.run (); return true; @@ -483,14 +496,14 @@ RouteUI::rec_enable_press(GdkEventButton* ev) if (!ignore_toggle && is_track() && rec_enable_button) { - if (Keyboard::is_button2_event (ev) && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + if (Keyboard::is_button2_event (ev)) { - // do nothing on midi bind event - return false; + // do nothing on midi sigc::bind event + return rec_enable_button->on_button_press_event (ev); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { - _session.set_record_enable (_session.get_routes(), !rec_enable_button->get_active()); + _session->set_record_enable (_session->get_routes(), !rec_enable_button->get_active()); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { @@ -498,7 +511,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) NOTE: Primary-button2 is MIDI learn. */ if (ev->button == 1 && _route->route_group()) { - _session.set_record_enable (_route->route_group()->route_list(), !rec_enable_button->get_active(), Session::rt_cleanup, true); + _session->set_record_enable (_route->route_group()->route_list(), !rec_enable_button->get_active(), Session::rt_cleanup, true); } } else if (Keyboard::is_context_menu_event (ev)) { @@ -509,7 +522,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) boost::shared_ptr rl (new RouteList); rl->push_back (route()); - _session.set_record_enable (rl, !rec_enable_button->get_active()); + _session->set_record_enable (rl, !rec_enable_button->get_active()); } } @@ -531,20 +544,20 @@ RouteUI::build_sends_menu () sends_menu->set_name ("ArdourContextMenu"); MenuList& items = sends_menu->items(); - items.push_back (MenuElem(_("Assign all tracks (prefader)"), bind (mem_fun (*this, &RouteUI::create_sends), PreFader))); - items.push_back (MenuElem(_("Assign all tracks (postfader)"), bind (mem_fun (*this, &RouteUI::create_sends), PostFader))); - items.push_back (MenuElem(_("Assign selected tracks (prefader)"), bind (mem_fun (*this, &RouteUI::create_selected_sends), PreFader))); - items.push_back (MenuElem(_("Assign selected tracks (postfader)"), bind (mem_fun (*this, &RouteUI::create_selected_sends), PostFader))); - items.push_back (MenuElem(_("Copy track gains to sends"), mem_fun (*this, &RouteUI::set_sends_gain_from_track))); - items.push_back (MenuElem(_("Set sends gain to -inf"), mem_fun (*this, &RouteUI::set_sends_gain_to_zero))); - items.push_back (MenuElem(_("Set sends gain to 0dB"), mem_fun (*this, &RouteUI::set_sends_gain_to_unity))); + items.push_back (MenuElem(_("Assign all tracks (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PreFader))); + items.push_back (MenuElem(_("Assign all tracks (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_sends), PostFader))); + items.push_back (MenuElem(_("Assign selected tracks (prefader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PreFader))); + items.push_back (MenuElem(_("Assign selected tracks (postfader)"), sigc::bind (sigc::mem_fun (*this, &RouteUI::create_selected_sends), PostFader))); + items.push_back (MenuElem(_("Copy track gains to sends"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_from_track))); + items.push_back (MenuElem(_("Set sends gain to -inf"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_to_zero))); + items.push_back (MenuElem(_("Set sends gain to 0dB"), sigc::mem_fun (*this, &RouteUI::set_sends_gain_to_unity))); } void RouteUI::create_sends (Placement p) { - _session.globally_add_internal_sends (_route, p); + _session->globally_add_internal_sends (_route, p); } void @@ -565,25 +578,25 @@ RouteUI::create_selected_sends (Placement p) } } - _session.add_internal_sends (_route, p, rlist); + _session->add_internal_sends (_route, p, rlist); } void RouteUI::set_sends_gain_from_track () { - _session.globally_set_send_gains_from_track (_route); + _session->globally_set_send_gains_from_track (_route); } void RouteUI::set_sends_gain_to_zero () { - _session.globally_set_send_gains_to_zero (_route); + _session->globally_set_send_gains_to_zero (_route); } void RouteUI::set_sends_gain_to_unity () { - _session.globally_set_send_gains_to_unity (_route); + _session->globally_set_send_gains_to_unity (_route); } bool @@ -597,7 +610,7 @@ RouteUI::show_sends_press(GdkEventButton* ev) if (Keyboard::is_button2_event (ev) && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - // do nothing on midi bind event + // do nothing on midi sigc::bind event return false; } else if (Keyboard::is_context_menu_event (ev)) { @@ -619,7 +632,7 @@ RouteUI::show_sends_press(GdkEventButton* ev) if (show_sends_button->get_active()) { /* show sends to this bus */ MixerStrip::SwitchIO (_route); - send_blink_connection = ARDOUR_UI::instance()->Blink.connect (mem_fun(*this, &RouteUI::send_blink)); + send_blink_connection = ARDOUR_UI::instance()->Blink.connect (sigc::mem_fun(*this, &RouteUI::send_blink)); } else { /* everybody back to normal */ send_blink_connection.disconnect (); @@ -655,19 +668,23 @@ RouteUI::send_blink (bool onoff) void RouteUI::solo_changed(void* /*src*/) { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_solo_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_solo_display, this)); } void RouteUI::listen_changed(void* /*src*/) { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_solo_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_solo_display, this)); } int RouteUI::solo_visual_state (boost::shared_ptr r) { + if (r->is_master() || r->is_monitor()) { + return 0; + } + if (Config->get_solo_control_is_listen_control()) { if (r->listening()) { @@ -676,25 +693,60 @@ RouteUI::solo_visual_state (boost::shared_ptr r) return 0; } + } + + if (r->soloed()) { + return 1; } else { + return 0; + } +} - if (r->solo_isolated()) { - return 2; - } else if (r->soloed()) { +int +RouteUI::solo_visual_state_with_isolate (boost::shared_ptr r) +{ + if (r->is_master() || r->is_monitor()) { + return 0; + } + + if (Config->get_solo_control_is_listen_control()) { + + if (r->listening()) { return 1; } else { return 0; } + + } + + if (r->solo_isolated()) { + return 2; + } else if (r->soloed()) { + return 1; + } else { + return 0; } +} - return 0; +int +RouteUI::solo_isolate_visual_state (boost::shared_ptr r) +{ + if (r->is_master() || r->is_monitor()) { + return 0; + } + + if (r->solo_isolated()) { + return 1; + } else { + return 0; + } } void RouteUI::update_solo_display () { bool x; - + if (Config->get_solo_control_is_listen_control()) { if (solo_button->get_active() != (x = _route->listening())) { @@ -713,30 +765,34 @@ RouteUI::update_solo_display () } - solo_button->set_visual_state (solo_visual_state (_route)); + solo_button->set_visual_state (solo_visual_state_with_isolate (_route)); } void RouteUI::solo_changed_so_update_mute () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_mute_display)); + update_mute_display (); } void RouteUI::mute_changed(void* /*src*/) { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_mute_display)); + update_mute_display (); } int -RouteUI::mute_visual_state (Session& s, boost::shared_ptr r) +RouteUI::mute_visual_state (Session* s, boost::shared_ptr r) { + if (r->is_master() || r->is_monitor()) { + return 0; + } + if (Config->get_show_solo_mutes()) { if (r->muted ()) { /* full mute */ return 2; - } else if (s.soloing() && !r->soloed() && !r->solo_isolated()) { + } else if (s->soloing() && !r->soloed() && !r->solo_isolated()) { /* mute-because-not-soloed */ return 1; } else { @@ -761,6 +817,10 @@ RouteUI::mute_visual_state (Session& s, boost::shared_ptr r) void RouteUI::update_mute_display () { + if (!_route) { + return; + } + bool model = _route->muted(); bool view = mute_button->get_active(); @@ -780,18 +840,22 @@ RouteUI::update_mute_display () void RouteUI::route_rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_rec_display)); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&RouteUI::update_rec_display, this)); } void RouteUI::session_rec_enable_changed () { - Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_rec_display)); + update_rec_display (); } void RouteUI::update_rec_display () { + if (!rec_enable_button || !_route) { + return; + } + bool model = _route->record_enabled(); bool view = rec_enable_button->get_active(); @@ -809,7 +873,7 @@ RouteUI::update_rec_display () if (model) { - switch (_session.record_status ()) { + switch (_session->record_status ()) { case Session::Recording: rec_enable_button->set_visual_state (1); break; @@ -840,20 +904,20 @@ RouteUI::build_solo_menu (void) check = new CheckMenuItem(_("Solo Isolate")); check->set_active (_route->solo_isolated()); - check->signal_toggled().connect (bind (mem_fun (*this, &RouteUI::toggle_solo_isolated), check)); - _route->solo_isolated_changed.connect(bind (mem_fun (*this, &RouteUI::solo_isolated_toggle), check)); + check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_isolated), check)); + _route->solo_isolated_changed.connect (route_connections, ui_bind (&RouteUI::solo_isolated_toggle, this, _1, check), gui_context()); items.push_back (CheckMenuElem(*check)); check->show_all(); check = new CheckMenuItem(_("Solo Safe")); check->set_active (_route->solo_safe()); - check->signal_toggled().connect (bind (mem_fun (*this, &RouteUI::toggle_solo_safe), check)); - _route->solo_safe_changed.connect(bind (mem_fun (*this, &RouteUI::solo_safe_toggle), check)); + check->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_solo_safe), check)); + _route->solo_safe_changed.connect (route_connections, ui_bind (&RouteUI::solo_safe_toggle, this, _1, check), gui_context()); items.push_back (CheckMenuElem(*check)); check->show_all(); //items.push_back (SeparatorElem()); - // items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn))); + // items.push_back (MenuElem (_("MIDI Bind"), sigc::mem_fun (*mute_button, &BindableToggleButton::midi_learn))); } @@ -869,32 +933,32 @@ RouteUI::build_mute_menu(void) pre_fader_mute_check = manage (new CheckMenuItem(_("Pre Fader"))); init_mute_menu(MuteMaster::PreFader, pre_fader_mute_check); - pre_fader_mute_check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PreFader, pre_fader_mute_check)); + pre_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PreFader, pre_fader_mute_check)); items.push_back (CheckMenuElem(*pre_fader_mute_check)); pre_fader_mute_check->show_all(); post_fader_mute_check = manage (new CheckMenuItem(_("Post Fader"))); init_mute_menu(MuteMaster::PostFader, post_fader_mute_check); - post_fader_mute_check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PostFader, post_fader_mute_check)); + post_fader_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::PostFader, post_fader_mute_check)); items.push_back (CheckMenuElem(*post_fader_mute_check)); post_fader_mute_check->show_all(); listen_mute_check = manage (new CheckMenuItem(_("Control Outs"))); init_mute_menu(MuteMaster::Listen, listen_mute_check); - listen_mute_check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::Listen, listen_mute_check)); + listen_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::Listen, listen_mute_check)); items.push_back (CheckMenuElem(*listen_mute_check)); listen_mute_check->show_all(); main_mute_check = manage (new CheckMenuItem(_("Main Outs"))); init_mute_menu(MuteMaster::Main, main_mute_check); - main_mute_check->signal_toggled().connect(bind (mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::Main, main_mute_check)); + main_mute_check->signal_toggled().connect(sigc::bind (sigc::mem_fun (*this, &RouteUI::toggle_mute_menu), MuteMaster::Main, main_mute_check)); items.push_back (CheckMenuElem(*main_mute_check)); main_mute_check->show_all(); //items.push_back (SeparatorElem()); - // items.push_back (MenuElem (_("MIDI Bind"), mem_fun (*mute_button, &BindableToggleButton::midi_learn))); + // items.push_back (MenuElem (_("MIDI Bind"), sigc::mem_fun (*mute_button, &BindableToggleButton::midi_learn))); - _route->mute_points_changed.connect (mem_fun (*this, &RouteUI::muting_change)); + _route->mute_points_changed.connect (route_connections, boost::bind (&RouteUI::muting_change, this), gui_context()); } void @@ -916,7 +980,7 @@ RouteUI::toggle_mute_menu(MuteMaster::MutePoint mp, Gtk::CheckMenuItem* check) void RouteUI::muting_change () { - ENSURE_GUI_THREAD(mem_fun (*this, &RouteUI::muting_change)); + ENSURE_GUI_THREAD (*this, &RouteUI::muting_change) bool yn; MuteMaster::MutePoint current = _route->mute_points (); @@ -1050,25 +1114,32 @@ RouteUI::remove_this_route () string prompt; if (is_track()) { - prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n(cannot be undone)"), _route->name()); + prompt = string_compose (_("Do you really want to remove track \"%1\" ?\n\nYou may also lose the playlist used by this track.\n(this cannot be undone)"), _route->name()); } else { - prompt = string_compose (_("Do you really want to remove bus \"%1\" ?\n(cannot be undone)"), _route->name()); + prompt = string_compose (_("Do you really want to remove bus \"%1\" ?\n(this cannot be undone)"), _route->name()); } choices.push_back (_("No, do nothing.")); choices.push_back (_("Yes, remove it.")); - Choice prompter (prompt, choices); + string title; + if (is_track()) { + title = _("Remove track"); + } else { + title = _("Remove bus"); + } + + Choice prompter (title, prompt, choices); if (prompter.run () == 1) { - Glib::signal_idle().connect (bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this)); + Glib::signal_idle().connect (sigc::bind (sigc::ptr_fun (&RouteUI::idle_remove_this_route), this)); } } gint RouteUI::idle_remove_this_route (RouteUI *rui) { - rui->_session.remove_route (rui->_route); + rui->_session->remove_route (rui->_route); return false; } @@ -1098,11 +1169,11 @@ RouteUI::route_rename () } void -RouteUI::name_changed () +RouteUI::property_changed (const PropertyChange& what_changed) { - ENSURE_GUI_THREAD(sigc::mem_fun(*this, &RouteUI::name_changed)); - - name_label.set_text (_route->name()); + if (what_changed.contains (ARDOUR::Properties::name)) { + name_label.set_text (_route->name()); + } } void @@ -1121,7 +1192,7 @@ void RouteUI::route_active_changed () { if (route_active_menu_item) { - Gtkmm2ext::UI::instance()->call_slot (bind (mem_fun (*route_active_menu_item, &CheckMenuItem::set_active), _route->active())); + Gtkmm2ext::UI::instance()->call_slot (boost::bind (&CheckMenuItem::set_active, route_active_menu_item, _route->active())); } } @@ -1132,7 +1203,7 @@ RouteUI::toggle_polarity () bool x; - ENSURE_GUI_THREAD(mem_fun (*this, &RouteUI::toggle_polarity)); + ENSURE_GUI_THREAD (*this, &RouteUI::toggle_polarity) if ((x = polarity_menu_item->get_active()) != _route->phase_invert()) { _route->set_phase_invert (x); @@ -1162,7 +1233,7 @@ RouteUI::toggle_denormal_protection () bool x; - ENSURE_GUI_THREAD(mem_fun (*this, &RouteUI::toggle_denormal_protection)); + ENSURE_GUI_THREAD (*this, &RouteUI::toggle_denormal_protection) if ((x = denormal_menu_item->get_active()) != _route->denormal_protection()) { _route->set_denormal_protection (x); @@ -1268,7 +1339,7 @@ RouteUI::name() const void RouteUI::map_frozen () { - ENSURE_GUI_THREAD (mem_fun (*this, &RouteUI::map_frozen)); + ENSURE_GUI_THREAD (*this, &RouteUI::map_frozen) AudioTrack* at = dynamic_cast(_route.get()); @@ -1287,7 +1358,7 @@ RouteUI::map_frozen () void RouteUI::adjust_latency () { - LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session.frame_rate(), _session.engine().frames_per_cycle()); + LatencyDialog dialog (_route->name() + _(" latency"), *(_route->output()), _session->frame_rate(), _session->engine().frames_per_cycle()); } void @@ -1328,7 +1399,7 @@ RouteUI::save_as_template () void RouteUI::check_rec_enable_sensitivity () { - if (_session.transport_rolling() && rec_enable_button->get_active() && Config->get_disable_disarm_during_roll()) { + if (_session->transport_rolling() && rec_enable_button->get_active() && Config->get_disable_disarm_during_roll()) { rec_enable_button->set_sensitive (false); } else { rec_enable_button->set_sensitive (true); @@ -1338,8 +1409,6 @@ RouteUI::check_rec_enable_sensitivity () void RouteUI::parameter_changed (string const & p) { - ENSURE_GUI_THREAD (bind (mem_fun (*this, &RouteUI::parameter_changed), p)); - if (p == "disable-disarm-during-roll") { check_rec_enable_sensitivity (); } else if (p == "solo-control-is-listen-control") { @@ -1378,7 +1447,7 @@ RouteUI::open_remote_control_id_dialog () { ArdourDialog dialog (_("Remote Control ID")); - uint32_t const limit = _session.ntracks() + _session.nbusses () + 4; + uint32_t const limit = _session->ntracks() + _session->nbusses () + 4; HBox* hbox = manage (new HBox); hbox->set_spacing (6);