fix errors in manual conflict resolution

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index bb3b5c7aecbcff484ac34628f18d17f268901347..7c3eae538f9531fa9e17b20a2a796c2ebb4b3c6b 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -62,7 +62,7 @@
 #include "ardour/plugin_manager.h"
 #include "ardour/rc_configuration.h"
 
-#include "ardour/ladspa_search_path.h"
+#include "ardour/search_paths.h"
 
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
@@ -83,7 +83,6 @@
 
 #include "pbd/error.h"
 #include "pbd/stl_delete.h"
-#include "pbd/fallback_folders.h"
 
 #include "i18n.h"
 
@@ -111,15 +110,15 @@ PluginManager::PluginManager ()
        , _ladspa_plugin_info(0)
        , _lv2_plugin_info(0)
        , _au_plugin_info(0)
-       , cancel_scan(false)
+       , _cancel_scan(false)
+       , _cancel_timeout(false)
 {
        char* s;
        string lrdf_path;
 
-       if (!PBD::find_file_in_search_path (
-                               PBD::Searchpath(Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst")),
-                               "ardour-vst-scanner", scanner_bin_path)) {
-               PBD::warning << "VST scanner app not found.'" << endmsg;
+       string  scan_p = Glib::build_filename(ARDOUR::ardour_dll_directory(), "fst");
+       if (!PBD::find_file_in_search_path ( PBD::Searchpath(scan_p), "ardour-vst-scanner", scanner_bin_path)) {
+               PBD::warning << "VST scanner app (ardour-vst-scanner) not found in path " << scan_p <<  endmsg;
        }
 
        load_statuses ();
@@ -153,11 +152,7 @@ PluginManager::PluginManager ()
        }
 
        if (windows_vst_path.length() == 0) {
-#ifdef PLATFORM_WINDOWS
-               windows_vst_path = PBD::get_platform_fallback_folder (PBD::FOLDER_VST);
-#else
-               windows_vst_path = "/usr/local/lib/vst:/usr/lib/vst";
-#endif
+               windows_vst_path = vst_search_path ();
        }
 
        if ((s = getenv ("LXVST_PATH"))) {
@@ -196,7 +191,7 @@ void
 PluginManager::refresh (bool cache_only)
 {
        DEBUG_TRACE (DEBUG::PluginManager, "PluginManager::refresh\n");
-       cancel_scan = false;
+       _cancel_scan = false;
 
        BootMessage (_("Scanning LADSPA Plugins"));
        ladspa_refresh ();
@@ -226,13 +221,19 @@ PluginManager::refresh (bool cache_only)
        BootMessage (_("Plugin Scan Complete..."));
        PluginListChanged (); /* EMIT SIGNAL */
        PluginScanMessage(X_("closeme"), "", false);
-       cancel_scan = false;
+       _cancel_scan = false;
 }
 
 void
 PluginManager::cancel_plugin_scan ()
 {
-       cancel_scan = true;
+       _cancel_scan = true;
+}
+
+void
+PluginManager::cancel_plugin_timeout ()
+{
+       _cancel_timeout = true;
 }
 
 void
@@ -678,6 +679,7 @@ PluginManager::windows_vst_discover (string path, bool cache_only)
 {
        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("windows_vst_discover '%1'\n", path));
 
+       _cancel_timeout = false;
        vector<VSTInfo*> * finfos = vstfx_get_info_fst (const_cast<char *> (path.c_str()),
                        cache_only ? VST_SCAN_CACHE_ONLY : VST_SCAN_USE_APP);
 
@@ -717,7 +719,8 @@ PluginManager::windows_vst_discover (string path, bool cache_only)
                info->index = 0;
                info->n_inputs.set_audio (finfo->numInputs);
                info->n_outputs.set_audio (finfo->numOutputs);
-               info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0);
+               info->n_inputs.set_midi ((finfo->wantMidi&1) ? 1 : 0);
+               info->n_outputs.set_midi ((finfo->wantMidi&2) ? 1 : 0);
                info->type = ARDOUR::Windows_VST;
 
                // TODO: check dup-IDs (lxvst AND windows vst)
@@ -800,6 +803,7 @@ PluginManager::lxvst_discover (string path, bool cache_only)
 {
        DEBUG_TRACE (DEBUG::PluginManager, string_compose ("checking apparent LXVST plugin at %1\n", path));
 
+       _cancel_timeout = false;
        vector<VSTInfo*> * finfos = vstfx_get_info_lx (const_cast<char *> (path.c_str()),
                        cache_only ? VST_SCAN_CACHE_ONLY : VST_SCAN_USE_APP);
 
@@ -837,7 +841,8 @@ PluginManager::lxvst_discover (string path, bool cache_only)
                info->index = 0;
                info->n_inputs.set_audio (finfo->numInputs);
                info->n_outputs.set_audio (finfo->numOutputs);
-               info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0);
+               info->n_inputs.set_midi ((finfo->wantMidi&1) ? 1 : 0);
+               info->n_outputs.set_midi ((finfo->wantMidi&2) ? 1 : 0);
                info->type = ARDOUR::LXVST;
 
                                        /* Make sure we don't find the same plugin in more than one place along