From fe3d85b2046cf9e0d016e3b8c070c2e5914419c6 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 19 Jan 2016 14:16:49 -0500 Subject: [PATCH] Revert "mackie: still respond to route groups visibility changes" This reverts commit a9ec547457bfa65655ee946063426f1ba85b6f91. --- libs/ardour/ardour/session.h | 4 ++-- libs/ardour/session.cc | 4 ++-- libs/ardour/session_state.cc | 2 +- libs/surfaces/mackie/mackie_control_protocol.cc | 13 +------------ libs/surfaces/mackie/mackie_control_protocol.h | 1 - 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index adadaa26f4..afc93a9f76 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -349,7 +349,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /** Emitted when a property of one of our route groups changes. * The parameter is the RouteGroup that has changed. */ - PBD::Signal2 RouteGroupPropertyChanged; + PBD::Signal1 RouteGroupPropertyChanged; /** Emitted when a route is added to one of our route groups. * First parameter is the RouteGroup, second is the route. */ @@ -1560,7 +1560,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void route_added_to_route_group (RouteGroup *, boost::weak_ptr); void route_removed_from_route_group (RouteGroup *, boost::weak_ptr); - void route_group_property_changed (RouteGroup *, PBD::PropertyChange); + void route_group_property_changed (RouteGroup *); /* SOURCES */ diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 115f720333..3da7f6c071 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -5638,9 +5638,9 @@ Session::solo_control_mode_changed () /** Called when a property of one of our route groups changes */ void -Session::route_group_property_changed (RouteGroup* rg, PropertyChange pc) +Session::route_group_property_changed (RouteGroup* rg) { - RouteGroupPropertyChanged (rg, pc); /* EMIT SIGNAL */ + RouteGroupPropertyChanged (rg); /* EMIT SIGNAL */ } /** Called when a route is added to one of our route groups */ diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 9df6754ba8..13d1413b19 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -2501,7 +2501,7 @@ Session::add_route_group (RouteGroup* g) g->RouteAdded.connect_same_thread (*this, boost::bind (&Session::route_added_to_route_group, this, _1, _2)); g->RouteRemoved.connect_same_thread (*this, boost::bind (&Session::route_removed_from_route_group, this, _1, _2)); - g->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::route_group_property_changed, this, g, _1)); + g->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::route_group_property_changed, this, g)); set_dirty (); } diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index e95b50b011..4256d9780a 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -704,7 +704,7 @@ MackieControlProtocol::connect_session_signals() // receive rude solo changed session->SoloActive.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_solo_active_changed, this, _1), this); // need to know if group parameters change... might be hidden. - session->RouteGroupPropertyChanged.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_group_property_changed, this, _2), this); + session->RouteGroupPropertyChanged.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_remote_id_changed, this), this); // make sure remote id changed signals reach here // see also notify_route_added @@ -1258,17 +1258,6 @@ MackieControlProtocol::notify_solo_active_changed (bool active) } } -void -MackieControlProtocol::notify_group_property_changed (PropertyChange pc) -{ - if (!pc.contains (Properties::hidden)) { - return; - } - - /* re-pick routes to show, as if remote ID(s) had changed */ - notify_remote_id_changed (); -} - void MackieControlProtocol::notify_remote_id_changed() { diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index df758074be..55696f4a3c 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -208,7 +208,6 @@ class MackieControlProtocol void notify_route_added_or_removed (); void notify_route_added (ARDOUR::RouteList &); void notify_remote_id_changed(); - void notify_group_property_changed (PBD::PropertyChange); void recalibrate_faders (); void toggle_backlight (); -- 2.30.2