smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-31 19:07:43 +01:00
Code Issues Projects Releases Wiki Activity

correctly restore VCA-VCA slave/master relationships at session load time

Browse source
This commit is contained in:
Paul Davis 2016-03-04 16:44:30 -05:00
parent aa80321976
commit 00b7385e4c
4 changed files with 42 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,12 +91,14 @@ class LIBARDOUR_API GainControl : public AutomationControl {
typedef std::map<uint32_t,MasterRecord> Masters;
Masters _masters;
PBD::ScopedConnectionList masters_connections;
std::string _masters_state_string ();
std::string masters_string;
PBD::ScopedConnection vca_loaded_connection;
gain_t get_value_locked () const;
gain_t get_master_gain_locked () const;
void master_going_away (boost::weak_ptr<VCA>);
void recompute_masters_ratios (double val);
void vcas_loaded();
void _set_value (double val, PBD::Controllable::GroupControlDisposition group_override);
};

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

@ -50,17 +50,21 @@ class VCAManager : public SessionHandleRef, public PBD::StatefulDestructible
VCAList vcas() const;
PBD::Signal0<void> VCAsLoaded;
PBD::Signal1<void,VCAList&> VCAAdded;
PBD::Signal1<void,VCAList&> VCARemoved;
XMLNode& get_state();
int set_state (XMLNode const&, int version);
bool vcas_loaded() const { return _vcas_loaded; }
static std::string xml_node_name;
private:
mutable Glib::Threads::Mutex lock;
VCAList _vcas;
bool _vcas_loaded;
void clear ();
};

39
libs/ardour/gain_control.cc
View file

@ -348,22 +348,41 @@ GainControl::set_state (XMLNode const& node, int version)
XMLProperty const* prop = node.property (X_("masters"));
/* XXX Problem here if we allow VCA's to be slaved to other VCA's .. we
* have to load all VCAs first, then call ::set_state() so that
* vca_by_number() will succeed.
/* Problem here if we allow VCA's to be slaved to other VCA's .. we
* have to load all VCAs first, then set up slave/master relationships
* once we have them all.
*/
if (prop) {
vector<string> masters;
split (prop->value(), masters, ',');
masters_string = prop->value ();
for (vector<string>::const_iterator m = masters.begin(); m != masters.end(); ++m) {
boost::shared_ptr<VCA> vca = _session.vca_manager().vca_by_number (PBD::atoi (*m));
if (vca) {
add_master (vca);
}
if (_session.vca_manager().vcas_loaded()) {
vcas_loaded ();
} else {
_session.vca_manager().VCAsLoaded.connect_same_thread (vca_loaded_connection, boost::bind (&GainControl::vcas_loaded, this));
}
}
return 0;
}
void
GainControl::vcas_loaded ()
{
if (masters_string.empty()) {
return;
}
vector<string> masters;
split (masters_string, masters, ',');
for (vector<string>::const_iterator m = masters.begin(); m != masters.end(); ++m) {
boost::shared_ptr<VCA> vca = _session.vca_manager().vca_by_number (PBD::atoi (*m));
if (vca) {
add_master (vca);
}
}
vca_loaded_connection.disconnect ();
masters_string.clear ();
}

6
libs/ardour/vca_manager.cc
View file

@ -33,6 +33,7 @@ string VCAManager::xml_node_name (X_("VCAManager"));
VCAManager::VCAManager (Session& s)
: SessionHandleRef (s)
, _vcas_loaded (false)
{
}
@ -140,6 +141,8 @@ VCAManager::set_state (XMLNode const& node, int version)
XMLNodeList const & children = node.children();
VCAList vcal;
_vcas_loaded = false;
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
if ((*i)->name() == VCA::xml_node_name) {
boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, **i, version));
@ -158,6 +161,9 @@ VCAManager::set_state (XMLNode const& node, int version)
}
}
_vcas_loaded = true;
VCAsLoaded (); /* EMIT SIGNAL */
VCAAdded (vcal); /* EMIT SIGNAL */
return 0;