projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Can't call the wrong function when there's only one of them: remove ARDOUR::Parameter...
[ardour.git] / libs / ardour / plugin_insert.cc
diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index f44a5df003b1f3329337bbefeaee749d4b044cdc..97ce2d7c0164795723b9dfc9e653015f59fc9486 100644 (file)
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -30,7 +30,7 @@
 #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>
@@ -80,7 +80,7 @@ PluginInsert::PluginInsert (Session& s, const XMLNode& node)
                throw failed_constructor();
        }
 
-       // set_automatable ();
+       set_automatable ();
 
        {
                Glib::Mutex::Lock em (_session.engine().process_lock());
@@ -147,14 +147,15 @@ PluginInsert::~PluginInsert ()
 }
 
 void
-PluginInsert::auto_state_changed (Parameter which)
+PluginInsert::auto_state_changed (Evoral::Parameter which)
 {
        if (which.type() != PluginAutomation)
                return;
 
-       boost::shared_ptr<AutomationControl> c = control (which);
+       boost::shared_ptr<AutomationControl> c
+                       = boost::dynamic_pointer_cast<AutomationControl>(data().control (which));
 
-       if (c && c->list()->automation_state() != Off) {
+       if (c && ((AutomationList*)c->list().get())->automation_state() != Off) {
                _plugins[0]->set_parameter (which.id(), c->list()->eval (_session.transport_frame()));
        }
 }
@@ -217,29 +218,24 @@ PluginInsert::is_generator() const
 void
 PluginInsert::set_automatable ()
 {
-       set<Parameter> a = _plugins.front()->automatable ();
+       set<Evoral::Parameter> a = _plugins.front()->automatable ();
 
        Plugin::ParameterDescriptor desc;
 
-       for (set<Parameter>::iterator i = a.begin(); i != a.end(); ++i) {
+       for (set<Evoral::Parameter>::iterator i = a.begin(); i != a.end(); ++i) {
                if (i->type() == PluginAutomation) {
                        can_automate (*i);
                        _plugins.front()->get_parameter_descriptor(i->id(), desc);
-                       boost::shared_ptr<AutomationList> list(new AutomationList(
-                                       *i,
-                                       //(desc.min_unbound ? FLT_MIN : desc.lower),
-                                       //(desc.max_unbound ? FLT_MAX : desc.upper),
-                                       desc.lower, desc.upper,
-                                       _plugins.front()->default_value(i->id())));
-
-                       add_control(boost::shared_ptr<AutomationControl>(
-                                       new PluginControl(*this, list)));
+                       Evoral::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, *i, list)));
                }
        }
 }
 
 void
-PluginInsert::parameter_changed (Parameter which, float val)
+PluginInsert::parameter_changed (Evoral::Parameter which, float val)
 {
        if (which.type() != PluginAutomation)
                return;
@@ -294,11 +290,12 @@ PluginInsert::connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t off
 
                uint32_t n = 0;
                
-               for (Controls::iterator li = _controls.begin(); li != _controls.end(); ++li, ++n) {
+               for (Controls::iterator li = data().controls().begin(); li != data().controls().end(); ++li, ++n) {
                        
-                       boost::shared_ptr<AutomationControl> c = li->second;
+                       boost::shared_ptr<AutomationControl> c
+                               = boost::dynamic_pointer_cast<AutomationControl>(li->second);
 
-                       if (c->parameter().type() == PluginAutomation && c->list()->automation_playback()) {
+                       if (c->parameter().type() == PluginAutomation && c->automation_playback()) {
                                bool valid;
 
                                const float val = c->list()->rt_safe_eval (now, valid);                         
@@ -362,7 +359,7 @@ PluginInsert::run_in_place (BufferSet& bufs, nframes_t start_frame, nframes_t en
 }
 
 void
-PluginInsert::set_parameter (Parameter param, float val)
+PluginInsert::set_parameter (Evoral::Parameter param, float val)
 {
        if (param.type() != PluginAutomation)
                return;
@@ -371,16 +368,21 @@ PluginInsert::set_parameter (Parameter param, float val)
 
        _plugins[0]->set_parameter (param.id(), val);
        
-       boost::shared_ptr<AutomationControl> c = control (param);
+       boost::shared_ptr<AutomationControl> ac
+                       = boost::dynamic_pointer_cast<AutomationControl>(data().control(param));
        
-       if (c)
-               c->set_value(val);
+       if (ac) {
+               ac->set_value(val);
+       } else {
+               warning << "set_parameter called for nonexistant parameter "
+                       << EventTypeMap::instance().to_symbol(param) << endmsg;
+       }
 
        _session.set_dirty();
 }
 
 float
-PluginInsert::get_parameter (Parameter param)
+PluginInsert::get_parameter (Evoral::Parameter param)
 {
        if (param.type() != PluginAutomation)
                return 0.0;
@@ -392,18 +394,18 @@ PluginInsert::get_parameter (Parameter param)
 void
 PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes, nframes_t offset)
 {
-       ControlEvent next_event (0, 0.0f);
+       Evoral::ControlEvent next_event (0, 0.0f);
        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 */
                
@@ -421,7 +423,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;
                }
        }
@@ -434,7 +436,7 @@ PluginInsert::automation_run (BufferSet& bufs, nframes_t nframes, nframes_t offs
 }      
 
 float
-PluginInsert::default_parameter_value (Parameter param)
+PluginInsert::default_parameter_value (const Evoral::Parameter& param)
 {
        if (param.type() != PluginAutomation)
                return 1.0;
@@ -629,9 +631,9 @@ PluginInsert::state (bool full)
 
        /* add port automation state */
        XMLNode *autonode = new XMLNode(port_automation_node_name);
-       set<Parameter> automatable = _plugins[0]->automatable();
+       set<Evoral::Parameter> automatable = _plugins[0]->automatable();
        
-       for (set<Parameter>::iterator x = automatable.begin(); x != automatable.end(); ++x) {
+       for (set<Evoral::Parameter>::iterator x = automatable.begin(); x != automatable.end(); ++x) {
                
                /*XMLNode* child = new XMLNode("port");
                snprintf(buf, sizeof(buf), "%" PRIu32, *x);
@@ -640,7 +642,7 @@ PluginInsert::state (bool full)
                child->add_child_nocopy (automation_list (*x).state (full));
                autonode->add_child_nocopy (*child);
                */
-               autonode->add_child_nocopy (control(*x)->list()->state (full));
+               autonode->add_child_nocopy (((AutomationList*)data().control(*x)->list().get())->state (full));
        }
 
        node.add_child_nocopy (*autonode);
@@ -763,8 +765,11 @@ PluginInsert::set_state(const XMLNode& node)
                                continue;
                        }
 
+                       boost::shared_ptr<AutomationControl> c = boost::dynamic_pointer_cast<AutomationControl>(
+                                       data().control(Evoral::Parameter(PluginAutomation, port_id), true));
+
                        if (!child->children().empty()) {
-                               control (Parameter(PluginAutomation, port_id), true)->list()->set_state (*child->children().front());
+                               c->alist()->set_state (*child->children().front());
                        } else {
                                if ((cprop = child->property("auto")) != 0) {
                                        
@@ -772,13 +777,13 @@ PluginInsert::set_state(const XMLNode& node)
 
                                        int x;
                                        sscanf (cprop->value().c_str(), "0x%x", &x);
-                                       control (Parameter(PluginAutomation, port_id), true)->list()->set_automation_state (AutoState (x));
+                                       c->alist()->set_automation_state (AutoState (x));
 
                                } else {
                                        
                                        /* missing */
                                        
-                                       control (Parameter(PluginAutomation, port_id), true)->list()->set_automation_state (Off);
+                                       c->alist()->set_automation_state (Off);
                                }
                        }
 
@@ -800,7 +805,7 @@ PluginInsert::set_state(const XMLNode& node)
 }
 
 string
-PluginInsert::describe_parameter (Parameter param)
+PluginInsert::describe_parameter (Evoral::Parameter param)
 {
        if (param.type() != PluginAutomation)
                return Automatable::describe_parameter(param);
@@ -847,13 +852,12 @@ PluginInsert::type ()
        }
 }
 
-PluginInsert::PluginControl::PluginControl (PluginInsert& p, boost::shared_ptr<AutomationList> list)
-       : AutomationControl (p.session(), list, p.describe_parameter(list->parameter()))
+PluginInsert::PluginControl::PluginControl (PluginInsert* p, const Evoral::Parameter &param, boost::shared_ptr<AutomationList> list)
+       : AutomationControl (p->session(), param, list, p->describe_parameter(param))
        , _plugin (p)
-       , _list (list)
 {
        Plugin::ParameterDescriptor desc;
-       p.plugin(0)->get_parameter_descriptor (list->parameter().id(), desc);
+       p->plugin(0)->get_parameter_descriptor (param.id(), desc);
        _logarithmic = desc.logarithmic;
        _toggled = desc.toggled;
 }
@@ -887,8 +891,8 @@ PluginInsert::PluginControl::set_value (float val)
 
        }
 
-       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugin._plugins.begin();
-                       i != _plugin._plugins.end(); ++i) {
+       for (vector<boost::shared_ptr<Plugin> >::iterator i = _plugin->_plugins.begin();
+                       i != _plugin->_plugins.end(); ++i) {
                (*i)->set_parameter (_list->parameter().id(), val);
        }
 
@@ -900,7 +904,7 @@ PluginInsert::PluginControl::get_value (void) const
 {
        /* FIXME: probably should be taking out some lock here.. */
        
-       float val = _plugin.get_parameter (_list->parameter());
+       float val = _plugin->get_parameter (_list->parameter());
 
        return val;
 
Unnamed repository; edit this file 'description' to name the repository.