Improved ExportProfileManager error handling, and added some missing (?) initialization
[ardour.git] / libs / ardour / plugin_insert.cc
index baf22a68639a252e9c737e68ad7aada829a7fbd0..fde0281ed13fbe3df52fb1072c735fbb798b38ec 100644 (file)
 #include <ardour/route.h>
 #include <ardour/ladspa_plugin.h>
 #include <ardour/buffer_set.h>
-#include <ardour/automation_event.h>
+#include <ardour/automation_list.h>
+
+#ifdef HAVE_SLV2
+#include <ardour/lv2_plugin.h>
+#endif
 
 #ifdef VST_SUPPORT
 #include <ardour/vst_plugin.h>
@@ -53,43 +57,39 @@ using namespace PBD;
 const string PluginInsert::port_automation_node_name = "PortAutomation";
 
 PluginInsert::PluginInsert (Session& s, boost::shared_ptr<Plugin> plug, Placement placement)
-       : Insert (s, plug->name(), placement)
+       : Processor (s, plug->name(), placement)
 {
        /* the first is the master */
 
        _plugins.push_back (plug);
 
-       _plugins[0]->ParameterChanged.connect (mem_fun (*this, &PluginInsert::parameter_changed));
-       
        init ();
 
        {
                Glib::Mutex::Lock em (_session.engine().process_lock());
-               IO::MoreChannels (max(input_streams(), output_streams()));
+               IO::PortCountChanged (max(input_streams(), output_streams()));
        }
 
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 PluginInsert::PluginInsert (Session& s, const XMLNode& node)
-       : Insert (s, "unnamed plugin insert", PreFader)
+       : Processor (s, "unnamed plugin insert", PreFader)
 {
        if (set_state (node)) {
                throw failed_constructor();
        }
 
-       set_automatable ();
-
-       _plugins[0]->ParameterChanged.connect (mem_fun (*this, &PluginInsert::parameter_changed));
+       // set_automatable ();
 
        {
                Glib::Mutex::Lock em (_session.engine().process_lock());
-               IO::MoreChannels (max(input_streams(), output_streams()));
+               IO::PortCountChanged (max(input_streams(), output_streams()));
        }
 }
 
 PluginInsert::PluginInsert (const PluginInsert& other)
-       : Insert (other._session, other._name, other.placement())
+       : Processor (other._session, other._name, other.placement())
 {
        uint32_t count = other._plugins.size();
 
@@ -98,12 +98,9 @@ PluginInsert::PluginInsert (const PluginInsert& other)
                _plugins.push_back (plugin_factory (other.plugin (n)));
        }
 
-
-       _plugins[0]->ParameterChanged.connect (mem_fun (*this, &PluginInsert::parameter_changed));
-
        init ();
 
-       InsertCreated (this); /* EMIT SIGNAL */
+       ProcessorCreated (this); /* EMIT SIGNAL */
 }
 
 bool
@@ -142,8 +139,6 @@ void
 PluginInsert::init ()
 {
        set_automatable ();
-
-       set<uint32_t>::iterator s;
 }
 
 PluginInsert::~PluginInsert ()
@@ -152,37 +147,50 @@ PluginInsert::~PluginInsert ()
 }
 
 void
-PluginInsert::automation_list_creation_callback (uint32_t which, AutomationList& alist)
+PluginInsert::auto_state_changed (Parameter which)
 {
-  alist.automation_state_changed.connect (sigc::bind (mem_fun (*this, &PluginInsert::auto_state_changed), (which)));
-}
+       if (which.type() != PluginAutomation)
+               return;
 
-void
-PluginInsert::auto_state_changed (uint32_t which)
-{
-       AutomationList& alist (automation_list (which));
+       boost::shared_ptr<AutomationControl> c
+                       = boost::dynamic_pointer_cast<AutomationControl>(data().control (which));
 
-       if (alist.automation_state() != Off) {
-               _plugins[0]->set_parameter (which, alist.eval (_session.transport_frame()));
+       if (c && ((AutomationList*)c->list().get())->automation_state() != Off) {
+               _plugins[0]->set_parameter (which.id(), c->list()->eval (_session.transport_frame()));
        }
 }
 
 ChanCount
 PluginInsert::output_streams() const
 {
-       if (_configured)
-               return output_for_input_configuration(_configured_input);
-       else
-               return natural_output_streams();
+       ChanCount out = _plugins.front()->get_info()->n_outputs;
+
+       if (out == ChanCount::INFINITE) {
+
+               return _plugins.front()->output_streams ();
+
+       } else {
+
+               out.set_audio (out.n_audio() * _plugins.size());
+               out.set_midi (out.n_midi() * _plugins.size());
+
+               return out;
+       }
 }
 
 ChanCount
 PluginInsert::input_streams() const
 {
-       if (_configured)
-               return _configured_input;
-       else
-               return natural_input_streams();
+       ChanCount in = _plugins[0]->get_info()->n_inputs;
+       
+       if (in == ChanCount::INFINITE) {
+               return _plugins[0]->input_streams ();
+       } else {
+               in.set_audio (in.n_audio() * _plugins.size());
+               in.set_midi (in.n_midi() * _plugins.size());
+
+               return in;
+       }
 }
 
 ChanCount
@@ -210,18 +218,28 @@ PluginInsert::is_generator() const
 void
 PluginInsert::set_automatable ()
 {
-       set<uint32_t> a;
-       
-       a = _plugins.front()->automatable ();
+       set<Parameter> a = _plugins.front()->automatable ();
+
+       Plugin::ParameterDescriptor desc;
 
-       for (set<uint32_t>::iterator i = a.begin(); i != a.end(); ++i) {
-               can_automate (*i);
+       for (set<Parameter>::iterator i = a.begin(); i != a.end(); ++i) {
+               if (i->type() == PluginAutomation) {
+                       can_automate (*i);
+                       _plugins.front()->get_parameter_descriptor(i->id(), desc);
+                       Parameter param(*i);
+                       param.set_range(desc.lower, desc.upper, _plugins.front()->default_value(i->id()));
+                       boost::shared_ptr<AutomationList> list(new AutomationList(param));
+                       add_control(boost::shared_ptr<AutomationControl>(new PluginControl(*this, list)));
+               }
        }
 }
 
 void
-PluginInsert::parameter_changed (uint32_t which, float val)
+PluginInsert::parameter_changed (Parameter which, float val)
 {
+       if (which.type() != PluginAutomation)
+               return;
+
        vector<boost::shared_ptr<Plugin> >::iterator i = _plugins.begin();
 
        /* don't set the first plugin, just all the slaves */
@@ -270,21 +288,20 @@ PluginInsert::connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t off
 
        if (with_auto) {
 
-               map<uint32_t,AutomationList*>::iterator li;
-               uint32_t n;
+               uint32_t n = 0;
                
-               for (n = 0, li = _parameter_automation.begin(); li != _parameter_automation.end(); ++li, ++n) {
+               for (Controls::iterator li = data().controls().begin(); li != data().controls().end(); ++li, ++n) {
                        
-                       AutomationList& alist (*((*li).second));
+                       boost::shared_ptr<AutomationControl> c
+                               = boost::dynamic_pointer_cast<AutomationControl>(li->second);
 
-                       if (alist.automation_playback()) {
+                       if (c->parameter().type() == PluginAutomation && c->automation_playback()) {
                                bool valid;
 
-                               float val = alist.rt_safe_eval (now, valid);                            
+                               const float val = c->list()->rt_safe_eval (now, valid);                         
 
                                if (valid) {
-                                       /* set the first plugin, the others will be set via signals */
-                                       _plugins[0]->set_parameter ((*li).first, val);
+                                       c->set_value(val);
                                }
 
                        } 
@@ -298,38 +315,6 @@ PluginInsert::connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t off
        /* leave remaining channel buffers alone */
 }
 
-void
-PluginInsert::automation_snapshot (nframes_t now)
-{
-       map<uint32_t,AutomationList*>::iterator li;
-       
-       for (li =_parameter_automation.begin(); li !=_parameter_automation.end(); ++li) {
-               
-               AutomationList *alist = ((*li).second);
-               if (alist != 0 && alist->automation_write ()) {
-                       
-                       float val = _plugins[0]->get_parameter ((*li).first);
-                       alist->rt_add (now, val);
-                       _last_automation_snapshot = now;
-               }
-       }
-}
-
-void
-PluginInsert::transport_stopped (nframes_t now)
-{
-       map<uint32_t,AutomationList*>::iterator li;
-
-       for (li =_parameter_automation.begin(); li !=_parameter_automation.end(); ++li) {
-               AutomationList& alist (*(li->second));
-               alist.reposition_for_rt_add (now);
-
-               if (alist.automation_state() != Off) {
-                       _plugins[0]->set_parameter (li->first, alist.eval (now));
-               }
-       }
-}
-
 void
 PluginInsert::silence (nframes_t nframes, nframes_t offset)
 {
@@ -344,7 +329,7 @@ PluginInsert::silence (nframes_t nframes, nframes_t offset)
 }
        
 void
-PluginInsert::run (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
+PluginInsert::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset)
 {
        if (active()) {
 
@@ -374,19 +359,32 @@ PluginInsert::run (BufferSet& bufs, nframes_t start_frame, nframes_t end_frame,
 }
 
 void
-PluginInsert::set_parameter (uint32_t port, float val)
+PluginInsert::set_parameter (Parameter param, float val)
 {
+       if (param.type() != PluginAutomation)
+               return;
+
        /* the others will be set from the event triggered by this */
 
-       _plugins[0]->set_parameter (port, val);
+       _plugins[0]->set_parameter (param.id(), val);
        
-       if (automation_list (port).automation_write()) {
-               automation_list (port).add (_session.audible_frame(), val);
-       }
+       boost::shared_ptr<Evoral::Control> c = data().control (param);
+       if (c)
+               c->set_value(val);
 
        _session.set_dirty();
 }
 
+float
+PluginInsert::get_parameter (Parameter param)
+{
+       if (param.type() != PluginAutomation)
+               return 0.0;
+       else
+               return
+               _plugins[0]->get_parameter (param.id());
+}
+
 void
 PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes, nframes_t offset)
 {
@@ -394,14 +392,14 @@ PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes, nframes_t offs
        nframes_t now = _session.transport_frame ();
        nframes_t end = now + nframes;
 
-       Glib::Mutex::Lock lm (_automation_lock, Glib::TRY_LOCK);
+       Glib::Mutex::Lock lm (data().control_lock(), Glib::TRY_LOCK);
 
        if (!lm.locked()) {
                connect_and_run (bufs, nframes, offset, false);
                return;
        }
        
-       if (!find_next_event (now, end, next_event)) {
+       if (!data().find_next_event (now, end, next_event)) {
                
                /* no events have a time within the relevant range */
                
@@ -419,7 +417,7 @@ PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes, nframes_t offs
                offset += cnt;
                now += cnt;
 
-               if (!find_next_event (now, end, next_event)) {
+               if (!data().find_next_event (now, end, next_event)) {
                        break;
                }
        }
@@ -432,69 +430,27 @@ PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes, nframes_t offs
 }      
 
 float
-PluginInsert::default_parameter_value (uint32_t port)
+PluginInsert::default_parameter_value (const Evoral::Parameter& param)
 {
+       if (param.type() != PluginAutomation)
+               return 1.0;
+
        if (_plugins.empty()) {
                fatal << _("programming error: ") << X_("PluginInsert::default_parameter_value() called with no plugin")
                      << endmsg;
                /*NOTREACHED*/
        }
 
-       return _plugins[0]->default_value (port);
-}
-       
-void
-PluginInsert::set_port_automation_state (uint32_t port, AutoState s)
-{
-       if (port < _plugins[0]->parameter_count()) {
-               
-               AutomationList& al = automation_list (port);
-
-               if (s != al.automation_state()) {
-                       al.set_automation_state (s);
-                       _session.set_dirty ();
-               }
-       }
-}
-
-AutoState
-PluginInsert::get_port_automation_state (uint32_t port)
-{
-       if (port < _plugins[0]->parameter_count()) {
-               return automation_list (port).automation_state();
-       } else {
-               return Off;
-       }
-}
-
-void
-PluginInsert::protect_automation ()
-{
-       set<uint32_t> automated_params;
-
-       what_has_automation (automated_params);
-
-       for (set<uint32_t>::iterator i = automated_params.begin(); i != automated_params.end(); ++i) {
-
-               AutomationList& al = automation_list (*i);
-
-               switch (al.automation_state()) {
-               case Write:
-                       al.set_automation_state (Off);
-                       break;
-               case Touch:
-                       al.set_automation_state (Play);
-                       break;
-               default:
-                       break;
-               }
-       }
+       return _plugins[0]->default_value (param.id());
 }
 
 boost::shared_ptr<Plugin>
 PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 {
        boost::shared_ptr<LadspaPlugin> lp;
+#ifdef HAVE_SLV2
+       boost::shared_ptr<LV2Plugin> lv2p;
+#endif
 #ifdef VST_SUPPORT
        boost::shared_ptr<VSTPlugin> vp;
 #endif
@@ -504,6 +460,10 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 
        if ((lp = boost::dynamic_pointer_cast<LadspaPlugin> (other)) != 0) {
                return boost::shared_ptr<Plugin> (new LadspaPlugin (*lp));
+#ifdef HAVE_SLV2
+       } else if ((lv2p = boost::dynamic_pointer_cast<LV2Plugin> (other)) != 0) {
+               return boost::shared_ptr<Plugin> (new LV2Plugin (*lv2p));
+#endif
 #ifdef VST_SUPPORT
        } else if ((vp = boost::dynamic_pointer_cast<VSTPlugin> (other)) != 0) {
                return boost::shared_ptr<Plugin> (new VSTPlugin (*vp));
@@ -524,31 +484,42 @@ PluginInsert::plugin_factory (boost::shared_ptr<Plugin> other)
 bool
 PluginInsert::configure_io (ChanCount in, ChanCount out)
 {
-       ChanCount matching_out = output_for_input_configuration(out);
-       if (matching_out != out) {
-               _configured = false;
+       if (set_count (count_for_configuration (in, out)) < 0) {
+               return false;
+       }
+
+       /* if we're running replicated plugins, each plugin has
+          the same i/o configuration and we may need to announce how many
+          output streams there are.
+
+          if we running a single plugin, we need to configure it.
+       */
+
+       if (_plugins.front()->configure_io (in, out) < 0) {
                return false;
-       } else {
-               bool success = set_count (count_for_configuration(in, out));
-               if (success)
-                       Insert::configure_io(in, out);
-               return success;
        }
+
+       return Processor::configure_io (in, out);
 }
 
 bool
-PluginInsert::can_support_input_configuration (ChanCount in) const
+PluginInsert::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
 {
+       if (_plugins.front()->reconfigurable_io()) {
+               /* plugin has flexible I/O, so delegate to it */
+               return _plugins.front()->can_support_io_configuration (in, out);
+       }
+
        ChanCount outputs = _plugins[0]->get_info()->n_outputs;
        ChanCount inputs = _plugins[0]->get_info()->n_inputs;
 
-       /* see output_for_input_configuration below */
        if ((inputs.n_total() == 0)
                        || (inputs.n_total() == 1 && outputs == inputs)
                        || (inputs.n_total() == 1 && outputs == inputs
                                && ((inputs.n_audio() == 0 && in.n_audio() == 0)
                                        || (inputs.n_midi() == 0 && in.n_midi() == 0)))
                        || (inputs == in)) {
+               out = outputs;
                return true;
        }
 
@@ -564,60 +535,31 @@ PluginInsert::can_support_input_configuration (ChanCount in) const
                }
        }
 
-       if (can_replicate && (in.n_total() % inputs.n_total() == 0)) {
-               return true;
-       } else {
+       if (!can_replicate || (in.n_total() % inputs.n_total() != 0)) {
                return false;
        }
-}
-
-ChanCount
-PluginInsert::output_for_input_configuration (ChanCount in) const
-{
-       ChanCount outputs = _plugins[0]->get_info()->n_outputs;
-       ChanCount inputs = _plugins[0]->get_info()->n_inputs;
 
        if (inputs.n_total() == 0) {
                /* instrument plugin, always legal, but throws away any existing streams */
-               return outputs;
-       }
-
-       if (inputs.n_total() == 1 && outputs == inputs
+               out = outputs;
+       } else if (inputs.n_total() == 1 && outputs == inputs
                        && ((inputs.n_audio() == 0 && in.n_audio() == 0)
-                               || (inputs.n_midi() == 0 && in.n_midi() == 0))) {
-               /* mono plugin, replicate as needed to match in */
-               return in;
-       }
-
-       if (inputs == in) {
+                           || (inputs.n_midi() == 0 && in.n_midi() == 0))) {
+               /* mono, single-typed plugin, replicate as needed to match in */
+               out = in;
+       } else if (inputs == in) {
                /* exact match */
-               return outputs;
-       }
-
-       bool can_replicate = true;
-
-       /* if number of inputs is a factor of the requested input
-          configuration for every type, we can replicate.
-       */
-       for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-               if (inputs.get(*t) >= in.get(*t) || (in.get(*t) % inputs.get(*t) != 0)) {
-                       can_replicate = false;
-                       break;
-               }
-       }
-
-       if (can_replicate && (inputs.n_total() % in.n_total() == 0)) {
-               ChanCount output;
-               
+               out = outputs;
+       } else {
+               /* replicate - note that we've already verified that
+                  the replication count is constant across all data types.
+               */
                for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                       output.set(*t, outputs.get(*t) * (in.get(*t) / inputs.get(*t)));
+                       out.set (*t, outputs.get(*t) * (in.get(*t) / inputs.get(*t)));
                }
-
-               return output;
        }
-
-       /* sorry */
-       return ChanCount();
+               
+       return true;
 }
 
 /* Number of plugin instances required to support a given channel configuration.
@@ -626,6 +568,12 @@ PluginInsert::output_for_input_configuration (ChanCount in) const
 int32_t
 PluginInsert::count_for_configuration (ChanCount in, ChanCount out) const
 {
+       if (_plugins.front()->reconfigurable_io()) {
+               /* plugin has flexible I/O, so the answer is always 1 */
+               /* this could change if we ever decide to replicate AU's */
+               return 1;
+       }
+
        // FIXME: take 'out' into consideration
        
        ChanCount outputs = _plugins[0]->get_info()->n_outputs;
@@ -668,32 +616,27 @@ PluginInsert::get_state(void)
 XMLNode&
 PluginInsert::state (bool full)
 {
-       char buf[256];
-       XMLNode& node = Insert::state (full);
+       XMLNode& node = Processor::state (full);
 
        node.add_property ("type", _plugins[0]->state_node_name());
-       snprintf(buf, sizeof(buf), "%s", _plugins[0]->name());
-       node.add_property("id", string(buf));
-       if (_plugins[0]->state_node_name() == "ladspa") {
-               char buf[32];
-               snprintf (buf, sizeof (buf), "%ld", _plugins[0]->get_info()->unique_id); 
-               node.add_property("unique-id", string(buf));
-       }
+       node.add_property("unique-id", _plugins[0]->unique_id());
        node.add_property("count", string_compose("%1", _plugins.size()));
        node.add_child_nocopy (_plugins[0]->get_state());
 
        /* add port automation state */
        XMLNode *autonode = new XMLNode(port_automation_node_name);
-       set<uint32_t> automatable = _plugins[0]->automatable();
+       set<Parameter> automatable = _plugins[0]->automatable();
        
-       for (set<uint32_t>::iterator x =  automatable.begin(); x != automatable.end(); ++x) {
+       for (set<Parameter>::iterator x = automatable.begin(); x != automatable.end(); ++x) {
                
-               XMLNode* child = new XMLNode("port");
+               /*XMLNode* child = new XMLNode("port");
                snprintf(buf, sizeof(buf), "%" PRIu32, *x);
                child->add_property("number", string(buf));
                
                child->add_child_nocopy (automation_list (*x).state (full));
                autonode->add_child_nocopy (*child);
+               */
+               autonode->add_child_nocopy (((AutomationList*)data().control(*x)->list().get())->state (full));
        }
 
        node.add_child_nocopy (*autonode);
@@ -708,7 +651,6 @@ PluginInsert::set_state(const XMLNode& node)
        XMLNodeIterator niter;
        XMLPropertyList plist;
        const XMLProperty *prop;
-       long unique = 0;
        ARDOUR::PluginType type;
 
        if ((prop = node.property ("type")) == 0) {
@@ -718,6 +660,8 @@ PluginInsert::set_state(const XMLNode& node)
 
        if (prop->value() == X_("ladspa") || prop->value() == X_("Ladspa")) { /* handle old school sessions */
                type = ARDOUR::LADSPA;
+       } else if (prop->value() == X_("lv2")) {
+               type = ARDOUR::LV2;
        } else if (prop->value() == X_("vst")) {
                type = ARDOUR::VST;
        } else {
@@ -726,24 +670,16 @@ PluginInsert::set_state(const XMLNode& node)
                      << endmsg;
                return -1;
        }
-
+       
        prop = node.property ("unique-id");
-       if (prop != 0) {
-               unique = atol(prop->value().c_str());
-       }
-
-       if ((prop = node.property ("id")) == 0) {
-               error << _("XML node describing insert is missing the `id' field") << endmsg;
-               return -1;
+       if (prop == 0) {
+               error << _("Plugin has no unique ID field") << endmsg;
+               return -1;
        }
 
        boost::shared_ptr<Plugin> plugin;
        
-       if (unique != 0) {
-               plugin = find_plugin (_session, "", unique, type);      
-       } else {
-               plugin = find_plugin (_session, prop->value(), 0, type);        
-       }
+       plugin = find_plugin (_session, prop->value(), type);   
 
        if (plugin == 0) {
                error << string_compose(_("Found a reference to a plugin (\"%1\") that is unknown.\n"
@@ -778,15 +714,15 @@ PluginInsert::set_state(const XMLNode& node)
 
        const XMLNode* insert_node = &node;
 
-       // legacy sessions: search for child Redirect node
+       // legacy sessions: search for child IOProcessor node
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-               if ((*niter)->name() == "Redirect") {
+               if ((*niter)->name() == "IOProcessor") {
                        insert_node = *niter;
                        break;
                }
        }
        
-       Insert::set_state (*insert_node);
+       Processor::set_state (*insert_node);
 
        /* look for port automation node */
        
@@ -823,8 +759,11 @@ PluginInsert::set_state(const XMLNode& node)
                                continue;
                        }
 
+                       boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl>(
+                                       data().control(Parameter(PluginAutomation, port_id), true));
+
                        if (!child->children().empty()) {
-                               automation_list (port_id).set_state (*child->children().front());
+                               c->alist()->set_state (*child->children().front());
                        } else {
                                if ((cprop = child->property("auto")) != 0) {
                                        
@@ -832,13 +771,13 @@ PluginInsert::set_state(const XMLNode& node)
 
                                        int x;
                                        sscanf (cprop->value().c_str(), "0x%x", &x);
-                                       automation_list (port_id).set_automation_state (AutoState (x));
+                                       c->alist()->set_automation_state (AutoState (x));
 
                                } else {
                                        
                                        /* missing */
                                        
-                                       automation_list (port_id).set_automation_state (Off);
+                                       c->alist()->set_automation_state (Off);
                                }
                        }
 
@@ -860,17 +799,24 @@ PluginInsert::set_state(const XMLNode& node)
 }
 
 string
-PluginInsert::describe_parameter (uint32_t what)
+PluginInsert::describe_parameter (Parameter param)
 {
-       return _plugins[0]->describe_parameter (what);
+       if (param.type() != PluginAutomation)
+               return Automatable::describe_parameter(param);
+
+       return _plugins[0]->describe_parameter (param);
 }
 
 ARDOUR::nframes_t 
-PluginInsert::latency() 
+PluginInsert::signal_latency() const
 {
-       return _plugins[0]->latency ();
+       if (_user_latency) {
+               return _user_latency;
+       }
+
+       return _plugins[0]->signal_latency ();
 }
-       
+
 ARDOUR::PluginType
 PluginInsert::type ()
 {
@@ -900,4 +846,74 @@ PluginInsert::type ()
        }
 }
 
+PluginInsert::PluginControl::PluginControl (PluginInsert& p, boost::shared_ptr<AutomationList> list)
+       : AutomationControl (p.session(), list->parameter(), list, p.describe_parameter(list->parameter()))
+       , _plugin (p)
+       , _list (list)
+{
+       Plugin::ParameterDescriptor desc;
+       p.plugin(0)->get_parameter_descriptor (list->parameter().id(), desc);
+       _logarithmic = desc.logarithmic;
+       _toggled = desc.toggled;
+}
+        
+void
+PluginInsert::PluginControl::set_value (float val)
+{
+       /* FIXME: probably should be taking out some lock here.. */
+       
+       if (_toggled) {
+               if (val > 0.5) {
+                       val = 1.0;
+               } else {
+                       val = 0.0;
+               }
+       } else {
+                       
+               /*const float range = _list->get_max_y() - _list->get_min_y();
+               const float lower = _list->get_min_y();
+
+               if (!_logarithmic) {
+                       val = lower + (range * val);
+               } else {
+                       float log_lower = 0.0f;
+                       if (lower > 0.0f) {
+                               log_lower = log(lower);
+                       }
+
+                       val = exp(log_lower + log(range) * val);
+               }*/
+
+       }
+
+       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugin._plugins.begin();
+                       i != _plugin._plugins.end(); ++i) {
+               (*i)->set_parameter (_list->parameter().id(), val);
+       }
+
+       AutomationControl::set_value(val);
+}
+
+float
+PluginInsert::PluginControl::get_value (void) const
+{
+       /* FIXME: probably should be taking out some lock here.. */
+       
+       float val = _plugin.get_parameter (_list->parameter());
+
+       return val;
+
+       /*if (_toggled) {
+               
+               return val;
+               
+       } else {
+               
+               if (_logarithmic) {
+                       val = log(val);
+               }
+               
+               return ((val - lower) / range);
+       }*/
+}