mackie: still respond to route groups visibility changes
This commit is contained in:
parent
22c5cb47f7
commit
a9ec547457
@ -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::Signal1<void, RouteGroup *> RouteGroupPropertyChanged;
|
||||
PBD::Signal2<void, RouteGroup *, PBD::PropertyChange> 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<Route>);
|
||||
void route_removed_from_route_group (RouteGroup *, boost::weak_ptr<Route>);
|
||||
void route_group_property_changed (RouteGroup *);
|
||||
void route_group_property_changed (RouteGroup *, PBD::PropertyChange);
|
||||
|
||||
/* SOURCES */
|
||||
|
||||
|
@ -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)
|
||||
Session::route_group_property_changed (RouteGroup* rg, PropertyChange pc)
|
||||
{
|
||||
RouteGroupPropertyChanged (rg); /* EMIT SIGNAL */
|
||||
RouteGroupPropertyChanged (rg, pc); /* EMIT SIGNAL */
|
||||
}
|
||||
|
||||
/** Called when a route is added to one of our route groups */
|
||||
|
@ -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));
|
||||
g->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::route_group_property_changed, this, g, _1));
|
||||
|
||||
set_dirty ();
|
||||
}
|
||||
|
@ -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_remote_id_changed, this), this);
|
||||
session->RouteGroupPropertyChanged.connect(session_connections, MISSING_INVALIDATOR, boost::bind (&MackieControlProtocol::notify_group_property_changed, this, _2), this);
|
||||
|
||||
// make sure remote id changed signals reach here
|
||||
// see also notify_route_added
|
||||
@ -1258,6 +1258,17 @@ 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()
|
||||
{
|
||||
|
@ -208,6 +208,7 @@ 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 ();
|
||||
|
Loading…
Reference in New Issue
Block a user