Merge branch 'master' of git.ardour.org:ardour/ardour

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

diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index a33dee2dbf38a63c384638a1febc3c350ad181aa..23cebf427679ec6938a6c7ea37475a58d67da82f 100644 (file)
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -262,21 +262,24 @@ PluginInsert::create_automatable_parameters ()
 }
 
 void
-PluginInsert::parameter_changed (Evoral::Parameter which, float val)
+PluginInsert::parameter_changed (uint32_t which, float val)
 {
-       if (which.type() != PluginAutomation)
-               return;
-
-       Plugins::iterator i = _plugins.begin();
+       boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, which));
 
-       /* don't set the first plugin, just all the slaves */
-
-       if (i != _plugins.end()) {
-               ++i;
-               for (; i != _plugins.end(); ++i) {
-                       (*i)->set_parameter (which, val);
-               }
-       }
+       if (ac) {
+               ac->set_value (val);
+                
+                Plugins::iterator i = _plugins.begin();
+                
+                /* don't set the first plugin, just all the slaves */
+                
+                if (i != _plugins.end()) {
+                        ++i;
+                        for (; i != _plugins.end(); ++i) {
+                                (*i)->set_parameter (which, val);
+                        }
+                }
+        }
 }
 
 int
@@ -549,7 +552,7 @@ PluginInsert::automation_run (BufferSet& bufs, pframes_t nframes)
        framepos_t end = now + nframes;
        framecnt_t offset = 0;
 
-       Glib::Mutex::Lock lm (control_lock(), Glib::TRY_LOCK);
+       Glib::Threads::Mutex::Lock lm (control_lock(), Glib::Threads::TRY_LOCK);
 
        if (!lm.locked()) {
                connect_and_run (bufs, nframes, offset, false);
@@ -1258,6 +1261,16 @@ void
 PluginInsert::add_plugin (boost::shared_ptr<Plugin> plugin)
 {
        plugin->set_insert_info (this);
+       
+       if (_plugins.empty()) {
+                /* first (and probably only) plugin instance - connect to relevant signals 
+                 */
+
+               plugin->ParameterChanged.connect_same_thread (*this, boost::bind (&PluginInsert::parameter_changed, this, _1, _2));
+                plugin->StartTouch.connect_same_thread (*this, boost::bind (&PluginInsert::start_touch, this, _1));
+                plugin->EndTouch.connect_same_thread (*this, boost::bind (&PluginInsert::end_touch, this, _1));
+       }
+
        _plugins.push_back (plugin);
 }
 
@@ -1284,3 +1297,21 @@ PluginInsert::monitoring_changed ()
                (*i)->monitoring_changed ();
        }
 }
+
+void
+PluginInsert::start_touch (uint32_t param_id)
+{
+        boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id));
+        if (ac) {
+                ac->start_touch (session().audible_frame());
+        }
+}
+
+void
+PluginInsert::end_touch (uint32_t param_id)
+{
+        boost::shared_ptr<AutomationControl> ac = automation_control (Evoral::Parameter (PluginAutomation, 0, param_id));
+        if (ac) {
+                ac->stop_touch (true, session().audible_frame());
+        }
+}