X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidi_patch_manager.cc;h=591c0cae40909743725d10976dc00bc0508db9c3;hb=cb3a60493620e5965de72d34fe0c0d2cce7ec037;hp=f3541a2e628d28e75a9c65346d581ce484645f72;hpb=0013feddbf260f0b57ee74786c316739806ea47a;p=ardour.git

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index f3541a2e62..591c0cae40 100644
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -29,11 +29,7 @@
 #include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
-#include "ardour/midi_patch_search_path.h"
+#include "ardour/search_paths.h"
 
 #include "i18n.h"
 
@@ -72,10 +68,9 @@ MidiPatchManager::add_session_patches ()
 
 	assert (Glib::file_test (path_to_patches, Glib::FILE_TEST_IS_DIR));
 
-	Glib::PatternSpec pattern(string("*.midnam"));
 	vector<std::string> result;
 
-	find_matching_files_in_directory (path_to_patches, pattern, result);
+	find_files_matching_pattern (result, path_to_patches, "*.midnam");
 
 	info << "Loading " << result.size() << " MIDI patches from " << path_to_patches << endmsg;
 
@@ -107,11 +102,10 @@ MidiPatchManager::refresh()
 	_master_devices_by_model.clear();
 	_all_models.clear();
 
-	SearchPath search_path = midi_patch_search_path ();
-	Glib::PatternSpec pattern (string("*.midnam"));
+	Searchpath search_path = midi_patch_search_path ();
 	vector<std::string> result;
 
-	find_matching_files_in_search_path (search_path, pattern, result);
+	find_files_matching_pattern (result, search_path, "*.midnam");
 
 	info << "Loading " << result.size() << " MIDI patches from " << search_path.to_string() << endmsg;