move SlavableAutomationControl into its own header

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

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index d92fa67c0356d111b85e2d3855165053ae8fa434..edad50ebdbc311990681e05e63fd984174d07264 100644 (file)
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -63,19 +63,18 @@ VCA::get_next_vca_number ()
 
 VCA::VCA (Session& s,  uint32_t num, const string& name)
        : Stripable (s, name)
+       , Muteable (s, name)
        , Automatable (s)
        , _number (num)
        , _gain_control (new GainControl (s, Evoral::Parameter (GainAutomation), boost::shared_ptr<AutomationList> ()))
-       , _solo_requested (false)
-       , _mute_requested (false)
 {
 }
 
 int
 VCA::init ()
 {
-       _solo_control.reset (new VCASoloControllable (X_("solo"), shared_from_this()));
-       _mute_control.reset (new VCAMuteControllable (X_("mute"), shared_from_this()));
+       _solo_control.reset (new SoloControl (_session, X_("solo"), *this, *this));
+       _mute_control.reset (new MuteControl (_session, X_("mute"), *this));
 
        add_control (_gain_control);
        add_control (_solo_control);
@@ -101,10 +100,10 @@ VCA::get_state ()
        XMLNode* node = new XMLNode (xml_node_name);
        node->add_property (X_("name"), _name);
        node->add_property (X_("number"), _number);
-       node->add_property (X_("soloed"), (_solo_requested ? X_("yes") : X_("no")));
-       node->add_property (X_("muted"), (_mute_requested ? X_("yes") : X_("no")));
 
        node->add_child_nocopy (_gain_control->get_state());
+       node->add_child_nocopy (_solo_control->get_state());
+       node->add_child_nocopy (_mute_control->get_state());
        node->add_child_nocopy (get_automation_xml_state());
 
        return *node;
@@ -126,131 +125,26 @@ VCA::set_state (XMLNode const& node, int version)
        XMLNodeList const &children (node.children());
        for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
                if ((*i)->name() == Controllable::xml_node_name) {
+
                        XMLProperty* prop = (*i)->property ("name");
-                       if (prop && prop->value() == X_("gaincontrol")) {
+
+                       if (!prop) {
+                               continue;
+                       }
+
+                       if (prop->value() == _gain_control->name()) {
                                _gain_control->set_state (**i, version);
                        }
+                       if (prop->value() == _solo_control->name()) {
+                               _solo_control->set_state (**i, version);
+                       }
+                       if (prop->value() == _mute_control->name()) {
+                               _mute_control->set_state (**i, version);
+                       }
                }
        }
 
        return 0;
 }
 
-void
-VCA::set_solo (bool yn)
-{
-       _solo_requested = yn;
-}
-
-void
-VCA::set_mute (bool yn)
-{
-       _mute_requested = yn;
-}
-
-bool
-VCA::soloed () const
-{
-       return _solo_requested;
-}
-
-bool
-VCA::muted () const
-{
-       return _mute_requested;
-}
-
-VCA::VCASoloControllable::VCASoloControllable (string const & name, boost::shared_ptr<VCA> vca)
-       : AutomationControl (vca->session(), Evoral::Parameter (SoloAutomation), ParameterDescriptor (Evoral::Parameter (SoloAutomation)),
-                            boost::shared_ptr<AutomationList>(), name)
-       , _vca (vca)
-{
-}
-
-void
-VCA::VCASoloControllable::set_value (double val, PBD::Controllable::GroupControlDisposition gcd)
-{
-       if (writable()) {
-               _set_value (val, gcd);
-       }
-}
-
-void
-VCA::VCASoloControllable::_set_value (double val, PBD::Controllable::GroupControlDisposition gcd)
-{
-       boost::shared_ptr<VCA> vca = _vca.lock();
-       if (!vca) {
-               return;
-       }
-
-       vca->set_solo (val >= 0.5);
-
-       AutomationControl::set_value (val, gcd);
-}
-
-void
-VCA::VCASoloControllable::set_value_unchecked (double val)
-{
-       /* used only by automation playback */
-       _set_value (val, Controllable::NoGroup);
-}
-
-double
-VCA::VCASoloControllable::get_value() const
-{
-       boost::shared_ptr<VCA> vca = _vca.lock();
-       if (!vca) {
-               return 0.0;
-       }
-
-       return vca->soloed() ? 1.0 : 0.0;
-}
-
-/*----*/
-
-VCA::VCAMuteControllable::VCAMuteControllable (string const & name, boost::shared_ptr<VCA> vca)
-       : AutomationControl (vca->session(), Evoral::Parameter (MuteAutomation), ParameterDescriptor (Evoral::Parameter (MuteAutomation)),
-                            boost::shared_ptr<AutomationList>(), name)
-       , _vca (vca)
-{
-}
-
-void
-VCA::VCAMuteControllable::set_value (double val, PBD::Controllable::GroupControlDisposition gcd)
-{
-       if (writable()) {
-               _set_value (val, gcd);
-       }
-}
-
-void
-VCA::VCAMuteControllable::_set_value (double val, PBD::Controllable::GroupControlDisposition gcd)
-{
-       boost::shared_ptr<VCA> vca = _vca.lock();
-
-       if (!vca) {
-               return;
-       }
-
-       vca->set_mute (val >= 0.5);
-
-       AutomationControl::set_value (val, gcd);
-}
 
-void
-VCA::VCAMuteControllable::set_value_unchecked (double val)
-{
-       /* used only by automation playback */
-       _set_value (val, Controllable::NoGroup);
-}
-
-double
-VCA::VCAMuteControllable::get_value() const
-{
-       boost::shared_ptr<VCA> vca = _vca.lock();
-       if (!vca) {
-               return 0.0;
-       }
-
-       return vca->muted() ? 1.0 : 0.0;
-}