diff options
| author | Robin Gareus <robin@gareus.org> | 2014-10-05 18:11:11 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-10-05 18:11:11 +0200 |
| commit | 94e7015c70a22c8834ce082f954160f79cbaed94 (patch) | |
| tree | ba57e10fd7b4062dbbb812dd4bc85b23a524a116 /libs/ardour | |
| parent | 114296d9586c957070c1d3ee940e4de8101e3e33 (diff) | |
64bit windows VSTs
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/session_vst.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/vst_info_file.cc | 9 | ||||
| -rw-r--r-- | libs/ardour/windows_vst_plugin.cc | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index 95d47afe88..e3aa91b491 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -80,7 +80,7 @@ intptr_t Session::vst_callback ( plug = (VSTPlugin *) (effect->user); session = &plug->session(); #ifdef PLATFORM_WINDOWS - SHOW_CALLBACK ("am callback 0x%x, opcode = %d, plugin = \"%s\" ", (int) pthread_self().p, opcode, plug->name()); + SHOW_CALLBACK ("am callback 0x%p, opcode = %d, plugin = \"%s\" ", pthread_self().p, opcode, plug->name()); #else SHOW_CALLBACK ("am callback 0x%x, opcode = %d, plugin = \"%s\" ", (int) pthread_self(), opcode, plug->name()); #endif @@ -88,7 +88,7 @@ intptr_t Session::vst_callback ( plug = 0; session = 0; #ifdef PLATFORM_WINDOWS - SHOW_CALLBACK ("am callback 0x%x, opcode = %d", (int) pthread_self().p, opcode); + SHOW_CALLBACK ("am callback 0x%p, opcode = %d", pthread_self().p, opcode); #else SHOW_CALLBACK ("am callback 0x%x, opcode = %d", (int) pthread_self(), opcode); #endif diff --git a/libs/ardour/vst_info_file.cc b/libs/ardour/vst_info_file.cc index a723f55d8b..3cfbad1297 100644 --- a/libs/ardour/vst_info_file.cc +++ b/libs/ardour/vst_info_file.cc @@ -384,8 +384,14 @@ vstfx_blacklist_file (const char *dllpath) { FILE *f; if ((f = fopen (vstfx_blacklist_path (dllpath, 0).c_str(), "wb"))) { +#ifndef NDEBUG + PBD::info << "Blacklisted VST: '" << vstfx_blacklist_path (dllpath, 0) << "'" << endmsg; +#endif return f; } +#ifndef NDEBUG + PBD::info << "Blacklisted VST: '" << vstfx_blacklist_path (dllpath, 1) << "'" << endmsg; +#endif return fopen (vstfx_blacklist_path (dllpath, 1).c_str(), "wb"); } @@ -486,6 +492,9 @@ vstfx_infofile_create (const char* dllpath, int personal) } string const path = vstfx_infofile_path (dllpath, personal); +#ifndef NDEBUG + PBD::info << "Creating VST cache file " << path << endmsg; +#endif return fopen (path.c_str(), "wb"); } diff --git a/libs/ardour/windows_vst_plugin.cc b/libs/ardour/windows_vst_plugin.cc index 03170e0d04..823b96cffe 100644 --- a/libs/ardour/windows_vst_plugin.cc +++ b/libs/ardour/windows_vst_plugin.cc @@ -71,7 +71,7 @@ WindowsVSTPluginInfo::load (Session& session) handle = fst_load(path.c_str()); - if ((int) handle == -1) { + if (!handle) { error << string_compose(_("VST: cannot load module from \"%1\""), path) << endmsg; } else { plugin.reset (new WindowsVSTPlugin (session.engine(), session, handle, PBD::atoi(unique_id))); |