diff options
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_routes.cc | 12 | ||||
-rw-r--r-- | gtk2_ardour/editor_routes.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/monitor_section.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.cc | 54 | ||||
-rw-r--r-- | gtk2_ardour/route_ui.h | 2 |
8 files changed, 41 insertions, 45 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 1ea6700b52..4d6a0a72d5 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2247,10 +2247,10 @@ ARDOUR_UI::toggle_record_enable (uint32_t rid) if ((r = _session->route_by_remote_id (rid)) != 0) { - Track* t; + boost::shared_ptr<Track> t; - if ((t = dynamic_cast<Track*>(r.get())) != 0) { - t->set_record_enabled (!t->record_enabled(), this); + if ((t = boost::dynamic_pointer_cast<Track>(r)) != 0) { + t->set_record_enabled (!t->record_enabled(), Controllable::UseGroup); } } } diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 814cded541..55d38f3a88 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -5701,7 +5701,7 @@ Editor::toggle_record_enable () first = false; } - rtav->track()->set_record_enabled (new_state, this); + rtav->track()->set_record_enabled (new_state, Controllable::UseGroup); } } @@ -5727,7 +5727,7 @@ Editor::toggle_solo () rl->push_back (rtav->route()); } - _session->set_solo (rl, new_state, Session::rt_cleanup, true); + _session->set_solo (rl, new_state, Session::rt_cleanup, Controllable::UseGroup); } void @@ -5752,7 +5752,7 @@ Editor::toggle_mute () rl->push_back (rtav->route()); } - _session->set_mute (rl, new_state, Session::rt_cleanup, true); + _session->set_mute (rl, new_state, Session::rt_cleanup, Controllable::UseGroup); } void diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 588b900f19..e4a48db5af 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -453,7 +453,7 @@ EditorRoutes::on_tv_solo_isolate_toggled (std::string const & path_string) RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv); if (rtv) { - rtv->route()->set_solo_isolated (!rtv->route()->solo_isolated(), this); + rtv->route()->set_solo_isolated (!rtv->route()->solo_isolated(), Controllable::UseGroup); } } @@ -467,7 +467,7 @@ EditorRoutes::on_tv_solo_safe_toggled (std::string const & path_string) RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (tv); if (rtv) { - rtv->route()->set_solo_safe (!rtv->route()->solo_safe(), this); + rtv->route()->set_solo_safe (!rtv->route()->solo_safe(), Controllable::UseGroup); } } @@ -711,8 +711,8 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) } (*x)->route()->mute_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_mute_display, this), gui_context()); - (*x)->route()->solo_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context()); - (*x)->route()->listen_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this, _1), gui_context()); + (*x)->route()->solo_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this), gui_context()); + (*x)->route()->listen_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_display, this), gui_context()); (*x)->route()->solo_isolated_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_isolate_display, this), gui_context()); (*x)->route()->solo_safe_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_solo_safe_display, this), gui_context()); (*x)->route()->active_changed.connect (*this, MISSING_INVALIDATOR, boost::bind (&EditorRoutes::update_active_display, this), gui_context ()); @@ -721,7 +721,7 @@ EditorRoutes::routes_added (list<RouteTimeAxisView*> routes) update_rec_display (); update_mute_display (); - update_solo_display (true); + update_solo_display (); update_solo_isolate_display (); update_solo_safe_display (); update_input_active_display (); @@ -1632,7 +1632,7 @@ EditorRoutes::update_mute_display () } void -EditorRoutes::update_solo_display (bool /* selfsoloed */) +EditorRoutes::update_solo_display () { if (g_atomic_int_compare_and_exchange (&_queue_tv_update, 0, 1)) { Glib::signal_idle().connect (sigc::mem_fun (*this, &EditorRoutes::idle_update_mute_rec_solo_etc)); diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h index 94a2186a4c..bee37378fb 100644 --- a/gtk2_ardour/editor_routes.h +++ b/gtk2_ardour/editor_routes.h @@ -86,7 +86,7 @@ private: bool idle_update_mute_rec_solo_etc (); void update_rec_display (); void update_mute_display (); - void update_solo_display (bool); + void update_solo_display (); void update_solo_isolate_display (); void update_solo_safe_display (); void update_input_active_display (); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 5247d89033..64b4494bac 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -637,7 +637,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) update_mute_display (); update_solo_display (); name_changed (); - comment_changed (0); + comment_changed (); route_group_changed (); connect_to_pan (); diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 0741bffa5d..d07ca51dd5 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -1210,7 +1210,7 @@ MonitorSection::cancel_isolate (GdkEventButton*) { if (_session) { boost::shared_ptr<RouteList> rl (_session->get_routes ()); - _session->set_solo_isolated (rl, false, Session::rt_cleanup, true); + _session->set_solo_isolated (rl, false, Session::rt_cleanup, Controllable::NoGroup); } return true; diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 059f20a885..ddba45b73f 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -259,7 +259,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp) _route->active_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::route_active_changed, this), gui_context()); _route->mute_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_mute_display, this), gui_context()); - _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::comment_changed, this, _1), gui_context()); + _route->comment_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::comment_changed, this), gui_context()); _route->solo_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context()); _route->solo_safe_changed.connect (route_connections, invalidator (*this), boost::bind (&RouteUI::update_solo_display, this), gui_context()); @@ -426,7 +426,7 @@ RouteUI::mute_press (GdkEventButton* ev) } DisplaySuspender ds; - _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, true); + _session->set_mute (rl, !_route->muted(), Session::rt_cleanup, Controllable::WholeGroup); } } else { @@ -454,7 +454,7 @@ RouteUI::mute_release (GdkEventButton* /*ev*/) { if (_mute_release){ DisplaySuspender ds; - _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, Controllable::UseGroup); delete _mute_release; _mute_release = 0; } @@ -555,9 +555,9 @@ RouteUI::solo_press(GdkEventButton* ev) DisplaySuspender ds; if (Config->get_solo_control_is_listen_control()) { - _session->set_listen (_session->get_routes(), !_route->listening_via_monitor(), Session::rt_cleanup, false); + _session->set_listen (_session->get_routes(), !_route->listening_via_monitor(), Session::rt_cleanup, Controllable::NoGroup); } else { - _session->set_solo (_session->get_routes(), !_route->self_soloed(), Session::rt_cleanup, false); + _session->set_solo (_session->get_routes(), !_route->self_soloed(), Session::rt_cleanup, Controllable::NoGroup); } } else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::SecondaryModifier))) { @@ -589,7 +589,7 @@ RouteUI::solo_press(GdkEventButton* ev) // shift-click: toggle solo isolated status - _route->set_solo_isolated (!_route->solo_isolated(), this); + _route->set_solo_isolated (!_route->solo_isolated(), Controllable::UseGroup); delete _solo_release; _solo_release = 0; @@ -620,9 +620,9 @@ RouteUI::solo_press(GdkEventButton* ev) DisplaySuspender ds; if (Config->get_solo_control_is_listen_control()) { - _session->set_listen (rl, !_route->listening_via_monitor(), Session::rt_cleanup, true); + _session->set_listen (rl, !_route->listening_via_monitor(), Session::rt_cleanup, Controllable::WholeGroup); } else { - _session->set_solo (rl, !_route->self_soloed(), Session::rt_cleanup, true); + _session->set_solo (rl, !_route->self_soloed(), Session::rt_cleanup, Controllable::WholeGroup); } } @@ -663,9 +663,9 @@ RouteUI::solo_release (GdkEventButton* /*ev*/) } else { DisplaySuspender ds; if (Config->get_solo_control_is_listen_control()) { - _session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, false); + _session->set_listen (_solo_release->routes, _solo_release->active, Session::rt_cleanup, Controllable::UseGroup); } else { - _session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, false); + _session->set_solo (_solo_release->routes, _solo_release->active, Session::rt_cleanup, Controllable::UseGroup); } } @@ -735,7 +735,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev) } DisplaySuspender ds; - _session->set_record_enabled (rl, !_route->record_enabled(), Session::rt_cleanup, true); + _session->set_record_enabled (rl, !_route->record_enabled(), Session::rt_cleanup, Controllable::WholeGroup); } } else if (Keyboard::is_context_menu_event (ev)) { @@ -865,7 +865,7 @@ RouteUI::monitor_release (GdkEventButton* ev, MonitorChoice monitor_choice) } DisplaySuspender ds; - _session->set_monitoring (rl, mc, Session::rt_cleanup, true); + _session->set_monitoring (rl, mc, Session::rt_cleanup, Controllable::UseGroup); return false; } @@ -1437,11 +1437,11 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev) if (model) { /* disable isolate for all routes */ DisplaySuspender ds; - _session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, true); + _session->set_solo_isolated (_session->get_routes(), false, Session::rt_cleanup, Controllable::NoGroup); } else { /* enable isolate for all routes */ DisplaySuspender ds; - _session->set_solo_isolated (_session->get_routes(), true, Session::rt_cleanup, true); + _session->set_solo_isolated (_session->get_routes(), true, Session::rt_cleanup, Controllable::NoGroup); } } else { @@ -1453,7 +1453,7 @@ RouteUI::solo_isolate_button_release (GdkEventButton* ev) boost::shared_ptr<RouteList> rl (new RouteList); rl->push_back (_route); DisplaySuspender ds; - _session->set_solo_isolated (rl, !view, Session::rt_cleanup, true); + _session->set_solo_isolated (rl, !view, Session::rt_cleanup, Controllable::NoGroup); } } } @@ -1478,20 +1478,20 @@ RouteUI::solo_safe_button_release (GdkEventButton* ev) /* disable solo safe for all routes */ DisplaySuspender ds; for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - (*i)->set_solo_safe (false, this); + (*i)->set_solo_safe (false, Controllable::NoGroup); } } else { /* enable solo safe for all routes */ DisplaySuspender ds; for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - (*i)->set_solo_safe (true, this); + (*i)->set_solo_safe (true, Controllable::NoGroup); } } } else { if (model == view) { /* flip just this route */ - _route->set_solo_safe (!view, this); + _route->set_solo_safe (!view, Controllable::NoGroup); } } } @@ -1508,14 +1508,14 @@ RouteUI::toggle_solo_isolated (Gtk::CheckMenuItem* check) /* called AFTER the view has changed */ if (model != view) { - _route->set_solo_isolated (view, this); + _route->set_solo_isolated (view, Controllable::UseGroup); } } void RouteUI::toggle_solo_safe (Gtk::CheckMenuItem* check) { - _route->set_solo_safe (check->get_active(), this); + _route->set_solo_safe (check->get_active(), Controllable::UseGroup); } /** Ask the user to choose a colour, and then apply that color to my route @@ -1702,17 +1702,13 @@ RouteUI::setup_comment_editor () } void -RouteUI::comment_changed (void *src) +RouteUI::comment_changed () { - ENSURE_GUI_THREAD (*this, &MixerStrip::comment_changed, src) - - if (src != this) { - ignore_comment_edit = true; - if (comment_area) { - comment_area->get_buffer()->set_text (_route->comment()); - } - ignore_comment_edit = false; + ignore_comment_edit = true; + if (comment_area) { + comment_area->get_buffer()->set_text (_route->comment()); } + ignore_comment_edit = false; } void diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index ff4d45300f..461419c848 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -241,7 +241,7 @@ class RouteUI : public virtual AxisView void toggle_comment_editor (); gint comment_key_release_handler (GdkEventKey*); - void comment_changed (void *src); + void comment_changed (); void comment_edited (); bool ignore_comment_edit; |