smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 11:46:25 +01:00
Code Issues Projects Releases Wiki Activity

Revert "mackie: still respond to route groups visibility changes"

Browse source 
This reverts commit a9ec547457.
This commit is contained in:
Paul Davis 2016-01-19 14:16:49 -05:00
parent a9ec547457
commit fe3d85b204
5 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/ardour/session.h
View file

@ -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. /** Emitted when a property of one of our route groups changes.
* The parameter is the RouteGroup that has changed. * The parameter is the RouteGroup that has changed.
*/ */
PBD::Signal2<void, RouteGroup *, PBD::PropertyChange> RouteGroupPropertyChanged; PBD::Signal1<void, RouteGroup *> RouteGroupPropertyChanged;
/** Emitted when a route is added to one of our route groups. /** Emitted when a route is added to one of our route groups.
* First parameter is the RouteGroup, second is the route. * 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<Route>); void route_added_to_route_group (RouteGroup *, boost::weak_ptr<Route>);
void route_removed_from_route_group (RouteGroup *, boost::weak_ptr<Route>); void route_removed_from_route_group (RouteGroup *, boost::weak_ptr<Route>);
void route_group_property_changed (RouteGroup *, PBD::PropertyChange); void route_group_property_changed (RouteGroup *);
/* SOURCES */ /* SOURCES */

4
libs/ardour/session.cc
View file

@ -5638,9 +5638,9 @@ Session::solo_control_mode_changed ()
/** Called when a property of one of our route groups changes */ /** Called when a property of one of our route groups changes */
void 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 */ /** Called when a route is added to one of our route groups */

2
libs/ardour/session_state.cc
View file

@ -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->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->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 (); set_dirty ();
} }

13
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -704,7 +704,7 @@ MackieControlProtocol::connect_session_signals()
// receive rude solo changed // receive rude solo changed
session->SoloActive.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_solo_active_changed, this, _1), this); 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. // 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 // make sure remote id changed signals reach here
// see also notify_route_added // 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 void
MackieControlProtocol::notify_remote_id_changed() MackieControlProtocol::notify_remote_id_changed()
{ {

1
libs/surfaces/mackie/mackie_control_protocol.h
View file

@ -208,7 +208,6 @@ class MackieControlProtocol
void notify_route_added_or_removed (); void notify_route_added_or_removed ();
void notify_route_added (ARDOUR::RouteList &); void notify_route_added (ARDOUR::RouteList &);
void notify_remote_id_changed(); void notify_remote_id_changed();
void notify_group_property_changed (PBD::PropertyChange);
void recalibrate_faders (); void recalibrate_faders ();
void toggle_backlight (); void toggle_backlight ();