diff options
| author | Robin Gareus <robin@gareus.org> | 2014-02-24 02:02:29 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-02-24 02:02:29 +0100 |
| commit | 8cca67e9c9ed3c240a049e124515288caffcd55d (patch) | |
| tree | af2b11da656076c7b1ea0c50bacbc75d59d21813 /libs | |
| parent | 2e0c98c48903c67fcef7abd77a7c53f3f2d41e2f (diff) | |
fix VST shell-scanner (double free), support for VST2.4
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/session_vst.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/vst_info_file.cc | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index 54843965b4..b279f52015 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -102,7 +102,7 @@ intptr_t Session::vst_callback ( case audioMasterVersion: SHOW_CALLBACK ("amc: audioMasterVersion\n"); // vst version, currently 2 (0 for older) - return 2; // XXX 2400 + return 2400; case audioMasterCurrentId: SHOW_CALLBACK ("amc: audioMasterCurrentId\n"); diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc index 7b9b0855bd..d5a082f018 100644 --- a/libs/ardour/vst_info_file.cc +++ b/libs/ardour/vst_info_file.cc @@ -520,16 +520,6 @@ vstfx_info_from_plugin (const char *dllpath, VSTState* vstfx, vector<VSTInfo *> } } } - } else { - switch(type) { -#ifdef WINDOWS_VST_SUPPORT - case 1: fst_close(vstfx); break; -#endif -#ifdef LXVST_SUPPORT - case 2: vstfx_close (vstfx); break; -#endif - default: assert(0); break; - } } #endif } @@ -549,7 +539,7 @@ simple_master_callback (AEffect *, int32_t opcode, int32_t, intptr_t, void *ptr, const int vstfx_can_do_string_count = 2; if (opcode == audioMasterVersion) { - return 2; + return 2400; } else if (opcode == audioMasterCanDo) { for (int i = 0; i < vstfx_can_do_string_count; i++) { |