Move functions in pbd/clear_dir.h/cc into pbd/file_utils.h/cc

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

diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index 4bced4e46dbaabc89112d28acf20a3de57f2e31c..591c0cae40909743725d10976dc00bc0508db9c3 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -28,7 +28,8 @@
 #include "ardour/session.h"
 #include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
-#include "ardour/midi_patch_search_path.h"
+
+#include "ardour/search_paths.h"
 
 #include "i18n.h"
 
@@ -67,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;
 
@@ -102,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;