Transfer 'lv2_bundled_search_path()' into 'libs/ardour/search_paths.cc'

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

diff --git a/libs/ardour/midi_patch_search_path.cc b/libs/ardour/midi_patch_search_path.cc
index 014e41f190c34478bd0d600fe1d3cbb08abb3bc0..c099c379e94926d3ee65ec76c02e9f0baf3a01b1 100644 (file)
--- a/libs/ardour/midi_patch_search_path.cc
+++ b/libs/ardour/midi_patch_search_path.cc
@@ -19,7 +19,7 @@
 
 #include <glibmm/miscutils.h>
 
-#include "ardour/midi_name_search_path.h"
+#include "ardour/midi_patch_search_path.h"
 #include "ardour/directory_names.h"
 #include "ardour/filesystem_paths.h"
 
@@ -31,16 +31,14 @@ using namespace PBD;
 
 namespace ARDOUR {
 
-SearchPath
+Searchpath
 midi_patch_search_path ()
 {
-       SearchPath spath (user_config_directory ());
-
-       spath += ardour_module_directory ();
+       Searchpath spath (ardour_data_search_path());
        spath.add_subdirectory_to_paths(midi_patch_dir_name);
 
        bool midi_patch_path_defined = false;
-       SearchPath spath_env (Glib::getenv(midi_patch_env_variable_name, midi_patch_path_defined));
+       Searchpath spath_env (Glib::getenv(midi_patch_env_variable_name, midi_patch_path_defined));
 
        if (midi_patch_path_defined) {
                spath += spath_env;