LV2 support.

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

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 792b316ed5cb9c1ec1c91ed837af8329c1ca680b..f1953af38646b6de83d0e52ae93acccea434fe53 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -79,7 +79,6 @@ Route::init ()
        _phase_invert = false;
        _denormal_protection = false;
        order_keys[strdup (N_("signal"))] = order_key_cnt++;
-       _active = true;
        _silent = false;
        _meter_point = MeterPostFader;
        _initial_delay = 0;
@@ -1263,7 +1262,13 @@ Route::check_some_plugin_counts (list<InsertCount>& iclist, int32_t required_inp
                }
                
                (*i).in = required_inputs;
-               (*i).out = (*i).insert->compute_output_streams ((*i).cnt);
+
+               if (((*i).out = (*i).insert->compute_output_streams ((*i).cnt)) < 0) {
+                       if (err_streams) {
+                               *err_streams = required_inputs;
+                       }
+                       return -1;
+               }
 
                required_inputs = (*i).out;
        }
@@ -1449,7 +1454,6 @@ Route::state(bool full_state)
        
        node->add_property("default-type", _default_type.to_string());
 
-       node->add_property("active", _active?"yes":"no");
        node->add_property("muted", _muted?"yes":"no");
        node->add_property("soloed", _soloed?"yes":"no");
        node->add_property("phase-invert", _phase_invert?"yes":"no");
@@ -1560,22 +1564,30 @@ Route::add_redirect_from_xml (const XMLNode& node)
                        if ((prop = node.property ("type")) != 0) {
 
                                boost::shared_ptr<Insert> insert;
+                               bool have_insert = false;
 
-                               if (prop->value() == "ladspa" || prop->value() == "Ladspa" || prop->value() == "vst") {
-
+                               if (prop->value() == "ladspa" || prop->value() == "Ladspa" || 
+                                   prop->value() == "lv2" ||
+                                   prop->value() == "vst" ||
+                                   prop->value() == "audiounit") {
+                                       
                                        insert.reset (new PluginInsert(_session, node));
+                                       have_insert = true;
                                        
                                } else if (prop->value() == "port") {
 
 
                                        insert.reset (new PortInsert (_session, node));
+                                       have_insert = true;
 
                                } else {
 
                                        error << string_compose(_("unknown Insert type \"%1\"; ignored"), prop->value()) << endmsg;
                                }
 
-                               add_redirect (insert, this);
+                               if (have_insert) {
+                                       add_redirect (insert, this);
+                               }
                                
                        } else {
                                error << _("Insert XML node has no type property") << endmsg;
@@ -1628,10 +1640,6 @@ Route::_set_state (const XMLNode& node, bool call_base)
                set_denormal_protection (prop->value()=="yes"?true:false, this);
        }
 
-       if ((prop = node.property (X_("active"))) != 0) {
-               set_active (prop->value() == "yes");
-       }
-
        if ((prop = node.property (X_("muted"))) != 0) {
                bool yn = prop->value()=="yes"?true:false; 
 
@@ -1991,7 +1999,7 @@ Route::set_control_outs (const vector<string>& ports)
        /* now connect to the named ports */
 
        for (uint32_t n = 0; n < limit; ++n) {
-               if (_control_outs->connect_output (_control_outs->output (n), ports[n], this)) {
+               if (_control_outs->connect_output (_control_outs->output (n), ports[n % ports.size()], this)) {
                        error << string_compose (_("could not connect %1 to %2"), _control_outs->output(n)->name(), ports[n]) << endmsg;
                        return -1;
                }
@@ -2163,13 +2171,6 @@ Route::get_mute_config (mute_type t)
        return onoff;
 }
 
-void
-Route::set_active (bool yn)
-{
-       _active = yn; 
-        active_changed(); /* EMIT SIGNAL */
-}
-
 void
 Route::handle_transport_stopped (bool abort_ignored, bool did_locate, bool can_flush_redirects)
 {