attempt to fix roll delay logic by moving it into DiskReader (the only place it matters)

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

diff --git a/libs/ardour/mac_vst_plugin.cc b/libs/ardour/mac_vst_plugin.cc
index b8f82325c6b6131310e22441946db072a2c72a0f..0b52096e6aff7951ebbdaf87742cca0241a71cdc 100644 (file)
--- a/libs/ardour/mac_vst_plugin.cc
+++ b/libs/ardour/mac_vst_plugin.cc
@@ -59,7 +59,6 @@ MacVSTPlugin::MacVSTPlugin (const MacVSTPlugin &other)
        Session::vst_current_loading_id = 0;
 
        XMLNode* root = new XMLNode (other.state_node_name ());
-       LocaleGuard lg;
        other.add_state (root);
        set_state (*root, Stateful::loading_state_version);
        delete root;
@@ -76,7 +75,7 @@ void
 MacVSTPlugin::open_plugin ()
 {
        VSTPlugin::open_plugin ();
-       _plugin->dispatcher (mac_vst->plugin, effCanDo, 0, 0, const_cast<char*> ("hasCockosViewAsConfig"), 0.0f);
+       _plugin->dispatcher (_plugin, effCanDo, 0, 0, const_cast<char*> ("hasCockosViewAsConfig"), 0.0f);
 }
 
 PluginPtr
@@ -127,7 +126,7 @@ MacVSTPluginInfo::get_presets (bool user_only) const
                Session::vst_current_loading_id = atoi (unique_id);
                AEffect* plugin = handle->main_entry (Session::vst_callback);
                Session::vst_current_loading_id = 0;
-               plugin->user = NULL;
+               plugin->ptr1 = NULL;
 
                plugin->dispatcher (plugin, effOpen, 0, 0, 0, 0); // :(
                int const vst_version = plugin->dispatcher (plugin, effGetVstVersion, 0, 0, NULL, 0);