Fix a problem where VST automation data wasn't getting written (if the adjustments...

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

diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc
old mode 100755 (executable)
new mode 100644 (file)
index f14d052..4bf6fca
--- a/libs/ardour/lxvst_plugin.cc
+++ b/libs/ardour/lxvst_plugin.cc
@@ -17,7 +17,7 @@
 
 */
 
-#include "ardour/vstfx.h"
+#include "ardour/linux_vst_support.h"
 #include "ardour/session.h"
 #include "ardour/lxvst_plugin.h"
 
@@ -27,14 +27,16 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-LXVSTPlugin::LXVSTPlugin (AudioEngine& e, Session& session, VSTHandle* h)
+LXVSTPlugin::LXVSTPlugin (AudioEngine& e, Session& session, VSTHandle* h, int unique_id)
        : VSTPlugin (e, session, h)
 {
        /* Instantiate the plugin and return a VSTState* */
 
+       Session::vst_current_loading_id = unique_id;
        if ((_state = vstfx_instantiate (_handle, Session::vst_callback, this)) == 0) {
                throw failed_constructor();
        }
+       Session::vst_current_loading_id = 0;
 
        set_plugin (_state->plugin);
 }
@@ -44,9 +46,12 @@ LXVSTPlugin::LXVSTPlugin (const LXVSTPlugin &other)
 {
        _handle = other._handle;
 
+       Session::vst_current_loading_id = PBD::atoi(other.unique_id());
        if ((_state = vstfx_instantiate (_handle, Session::vst_callback, this)) == 0) {
                throw failed_constructor();
        }
+       Session::vst_current_loading_id = 0;
+
        _plugin = _state->plugin;
 
        // Plugin::setup_controls ();
@@ -57,7 +62,7 @@ LXVSTPlugin::~LXVSTPlugin ()
        vstfx_close (_state);
 }
 
-PluginPtr 
+PluginPtr
 LXVSTPluginInfo::load (Session& session)
 {
        try {
@@ -72,7 +77,7 @@ LXVSTPluginInfo::load (Session& session)
                                error << string_compose(_("LXVST: cannot load module from \"%1\""), path) << endmsg;
                        }
                        else {
-                               plugin.reset (new LXVSTPlugin (session.engine(), session, handle));
+                               plugin.reset (new LXVSTPlugin (session.engine(), session, handle, PBD::atoi(unique_id)));
                        }
                }
                else {