From fd8053da9eaf5e97aaa978d971410d4f246c7138 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 8 Jul 2017 18:13:42 +0200 Subject: Don't use VST ->user points, prefer host-reserved ptr Apparently "user" is for plugins (not hosts) to use. --- libs/ardour/linux_vst_support.cc | 2 +- libs/ardour/lxvst_plugin.cc | 2 +- libs/ardour/mac_vst_plugin.cc | 2 +- libs/ardour/mac_vst_support.cc | 2 +- libs/ardour/session_vst.cc | 4 ++-- libs/ardour/vst_plugin.cc | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/linux_vst_support.cc b/libs/ardour/linux_vst_support.cc index 44d61f7a77..498cbc8339 100644 --- a/libs/ardour/linux_vst_support.cc +++ b/libs/ardour/linux_vst_support.cc @@ -297,7 +297,7 @@ vstfx_instantiate (VSTHandle* fhandle, audioMasterCallback amc, void* userptr) } vstfx->handle = fhandle; - vstfx->plugin->user = userptr; + vstfx->plugin->ptr1 = userptr; if (vstfx->plugin->magic != kEffectMagic) { diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc index dd7b1b4831..62fff3f8b8 100644 --- a/libs/ardour/lxvst_plugin.cc +++ b/libs/ardour/lxvst_plugin.cc @@ -119,7 +119,7 @@ LXVSTPluginInfo::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); diff --git a/libs/ardour/mac_vst_plugin.cc b/libs/ardour/mac_vst_plugin.cc index 380620febb..0b52096e6a 100644 --- a/libs/ardour/mac_vst_plugin.cc +++ b/libs/ardour/mac_vst_plugin.cc @@ -126,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); diff --git a/libs/ardour/mac_vst_support.cc b/libs/ardour/mac_vst_support.cc index ae40e53a71..b1f27eef31 100644 --- a/libs/ardour/mac_vst_support.cc +++ b/libs/ardour/mac_vst_support.cc @@ -194,7 +194,7 @@ mac_vst_instantiate (VSTHandle* fhandle, audioMasterCallback amc, void* userptr) } mac_vst->handle = fhandle; - mac_vst->plugin->user = userptr; + mac_vst->plugin->ptr1 = userptr; if (mac_vst->plugin->magic != kEffectMagic) { diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index e086bbbce0..3950a29478 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -69,8 +69,8 @@ intptr_t Session::vst_callback ( VstTimeInfo* timeinfo; int32_t newflags = 0; - if (effect && effect->user) { - plug = (VSTPlugin *) (effect->user); + if (effect && effect->ptr1) { + plug = (VSTPlugin *) (effect->ptr1); session = &plug->session(); timeinfo = plug->timeinfo (); DEBUG_TRACE (PBD::DEBUG::VSTCallbacks, string_compose ("am callback 0x%1%2, opcode = %3%4, plugin = \"%5\"\n", diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc index b61ee4186c..be520ddc17 100644 --- a/libs/ardour/vst_plugin.cc +++ b/libs/ardour/vst_plugin.cc @@ -79,8 +79,8 @@ void VSTPlugin::open_plugin () { _plugin = _state->plugin; - assert (_plugin->user == this); // should have been set by {mac_vst|fst|lxvst}_instantiate - _plugin->user = this; + assert (_plugin->ptr1 == this); // should have been set by {mac_vst|fst|lxvst}_instantiate + _plugin->ptr1 = this; _state->plugin->dispatcher (_plugin, effOpen, 0, 0, 0, 0); _state->vst_version = _plugin->dispatcher (_plugin, effGetVstVersion, 0, 0, 0, 0); } -- cgit v1.2.3