ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

make route group master a real property.

Browse Source 
Required for state save/restore to know about the master
This commit is contained in:
Paul Davis 2016-07-08 11:44:45 -04:00
parent 965def3caf
commit 24b514797a
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/ardour/route_group.h
View File

@ -48,6 +48,7 @@ namespace Properties {
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_color;
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> group_monitoring;
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> active;
LIBARDOUR_API extern PBD::PropertyDescriptor<int32_t> group_master_number;
/* we use these declared in region.cc */
LIBARDOUR_API extern PBD::PropertyDescriptor<bool> hidden;
};
@ -75,7 +76,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
bool is_active () const { return _active.val(); }
bool is_relative () const { return _relative.val(); }
bool is_hidden () const { return _hidden.val(); }
bool is_gain () const { return _gain.val(); }
bool is_gain () const { return _gain.val() && _group_master_number.val() > 0; }
bool is_mute () const { return _mute.val(); }
bool is_solo () const { return _solo.val(); }
bool is_recenable () const { return _recenable.val(); }
@ -83,6 +84,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
bool is_route_active () const { return _route_active.val(); }
bool is_color () const { return _color.val(); }
bool is_monitoring() const { return _monitoring.val(); }
int32_t group_master_number() const { return _group_master_number.val(); }
bool empty() const {return routes->empty();}
size_t size() const { return routes->size();}
@ -145,6 +147,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
void assign_master (boost::shared_ptr<VCA>);
void unassign_master (boost::shared_ptr<VCA>);
bool has_control_master() const;
bool slaved () const;
private:
@ -163,6 +166,7 @@ class LIBARDOUR_API RouteGroup : public SessionObject
PBD::Property<bool> _route_active;
PBD::Property<bool> _color;
PBD::Property<bool> _monitoring;
PBD::Property<int32_t> _group_master_number;
boost::shared_ptr<ControlGroup> _solo_group;
boost::shared_ptr<ControlGroup> _mute_group;

40
libs/ardour/route_group.cc
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2000-2009 Paul Davis
Copyright (C) 2000-2016 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -28,11 +28,13 @@
#include "ardour/amp.h"
#include "ardour/audio_track.h"
#include "ardour/debug.h"
#include "ardour/monitor_control.h"
#include "ardour/route.h"
#include "ardour/route_group.h"
#include "ardour/session.h"
#include "ardour/debug.h"
#include "ardour/vca.h"
#include "ardour/vca_manager.h"
#include "i18n.h"
@ -52,6 +54,7 @@ namespace ARDOUR {
PropertyDescriptor<bool> group_route_active;
PropertyDescriptor<bool> group_color;
PropertyDescriptor<bool> group_monitoring;
PropertyDescriptor<int32_t> group_master_number;
}
}
@ -76,9 +79,11 @@ RouteGroup::make_property_quarks ()
Properties::group_route_active.property_id = g_quark_from_static_string (X_("route-active"));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for route-active = %1\n", Properties::group_route_active.property_id));
Properties::group_color.property_id = g_quark_from_static_string (X_("color"));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for color = %1\n", Properties::group_color.property_id));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for color = %1\n", Properties::group_color.property_id));
Properties::group_monitoring.property_id = g_quark_from_static_string (X_("monitoring"));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for monitoring = %1\n", Properties::group_monitoring.property_id));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for monitoring = %1\n", Properties::group_monitoring.property_id));
Properties::group_master_number.property_id = g_quark_from_static_string (X_("group-master-number"));
DEBUG_TRACE (DEBUG::Properties, string_compose ("quark for group-master-number = %1\n", Properties::group_master_number.property_id));
}
#define ROUTE_GROUP_DEFAULT_PROPERTIES _relative (Properties::group_relative, true) \
@ -91,7 +96,8 @@ RouteGroup::make_property_quarks ()
, _select (Properties::group_select, true) \
, _route_active (Properties::group_route_active, true) \
, _color (Properties::group_color, true) \
, _monitoring (Properties::group_monitoring, true)
, _monitoring (Properties::group_monitoring, true) \
, _group_master_number (Properties::group_master_number, -1)
RouteGroup::RouteGroup (Session& s, const string &n)
: SessionObject (s, n)
@ -116,6 +122,7 @@ RouteGroup::RouteGroup (Session& s, const string &n)
add_property (_route_active);
add_property (_color);
add_property (_monitoring);
add_property (_group_master_number);
}
RouteGroup::~RouteGroup ()
@ -274,6 +281,17 @@ RouteGroup::set_state (const XMLNode& node, int version)
}
}
if (_group_master_number.val() > 0) {
boost::shared_ptr<VCA> vca = _session.vca_manager().vca_by_number (_group_master_number.val());
if (vca) {
/* no need to do the assignment because slaves will
handle that themselves. But we can set group_master
to use with future assignments of newly added routes.
*/
group_master = vca;
}
}
push_to_groups ();
return 0;
@ -311,6 +329,10 @@ RouteGroup::set_gain (bool yn)
if (is_gain() == yn) {
return;
}
if (has_control_master()) {
return;
}
_gain = yn;
_gain_group->set_active (yn);
@ -605,6 +627,7 @@ RouteGroup::assign_master (boost::shared_ptr<VCA> master)
}
group_master = master;
_group_master_number = master->number();
}
void
@ -625,6 +648,7 @@ RouteGroup::unassign_master (boost::shared_ptr<VCA> master)
}
group_master.reset ();
_group_master_number = -1;
}
bool
@ -636,3 +660,9 @@ RouteGroup::slaved () const
return routes->front()->slaved ();
}
bool
RouteGroup::has_control_master() const
{
return group_master.lock() != 0;
}