fix crash when copy'ing latent plugins

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

diff --git a/libs/ardour/vca.cc b/libs/ardour/vca.cc
index 27ecec7910364e992453b146f438e1875588c548..a2b16913bbb05c3bab47d43c4cbbfff78f6f4551 100644 (file)
--- a/libs/ardour/vca.cc
+++ b/libs/ardour/vca.cc
@@ -23,19 +23,18 @@
 #include "ardour/gain_control.h"
 #include "ardour/monitor_control.h"
 #include "ardour/rc_configuration.h"
-#include "ardour/record_enable_control.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
 #include "ardour/vca.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 using std::string;
 
 Glib::Threads::Mutex VCA::number_lock;
-uint32_t VCA::next_number = 1;
+int32_t VCA::next_number = 1;
 string VCA::xml_node_name (X_("VCA"));
 
 string
@@ -44,7 +43,7 @@ VCA::default_name_template ()
        return _("VCA %n");
 }
 
-uint32_t
+int32_t
 VCA::next_vca_number ()
 {
        /* we could use atomic inc here, but elsewhere we need more complete
@@ -55,20 +54,20 @@ VCA::next_vca_number ()
 }
 
 void
-VCA::set_next_vca_number (uint32_t n)
+VCA::set_next_vca_number (int32_t n)
 {
        Glib::Threads::Mutex::Lock lm (number_lock);
        next_number = n;
 }
 
-uint32_t
+int32_t
 VCA::get_next_vca_number ()
 {
        Glib::Threads::Mutex::Lock lm (number_lock);
        return next_number;
 }
 
-VCA::VCA (Session& s,  uint32_t num, const string& name)
+VCA::VCA (Session& s,  int32_t num, const string& name)
        : Stripable (s, name, PresentationInfo (num, PresentationInfo::VCA))
        , Muteable (s, name)
        , Automatable (s)
@@ -82,8 +81,6 @@ VCA::init ()
 {
        _solo_control.reset (new SoloControl (_session, X_("solo"), *this, *this));
        _mute_control.reset (new MuteControl (_session, X_("mute"), *this));
-       _recenable_control.reset (new RecordEnableControl (_session, X_("recenable"), *this));
-       _monitor_control.reset (new MonitorControl (_session, X_("monitoring"), *this));
 
        add_control (_gain_control);
        add_control (_solo_control);
@@ -113,7 +110,7 @@ VCA::get_state ()
        node->add_property (X_("name"), _name);
        node->add_property (X_("number"), _number);
 
-       Stripable::add_state (*node);
+       node->add_child_nocopy (_presentation_info.get_state());
 
        node->add_child_nocopy (_gain_control->get_state());
        node->add_child_nocopy (_solo_control->get_state());