when calculating average slave/master delta, use absolute value.

[ardour.git] / libs / ardour / vca.cc

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index 8ec3a55ac4aea11bf98f48b0ca3a142239e179a9..7be103e9e439af0443c6a435f50b2ac589dc8436 100644 (file)
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -165,6 +165,8 @@ VCA::set_state (XMLNode const& node, int version)
                        }
                } else if ((*i)->name() == Slavable::xml_node_name) {
                        Slavable::set_state (**i, version);
+               } else if ((*i)->name() == Automatable::xml_node_name) {
+                       set_automation_xml_state (**i, Evoral::Parameter(NullAutomation));
                }
        }
 
@@ -205,3 +207,13 @@ VCA::slaved_to (boost::shared_ptr<VCA> vca) const
 
        return _gain_control->slaved_to (vca->gain_control());
 }
+
+SlavableControlList
+VCA::slavables () const
+{
+       SlavableControlList rv;
+       rv.push_back (_gain_control);
+       rv.push_back (_mute_control);
+       rv.push_back (_solo_control);
+       return rv;
+}