Merge branch 'master' into windows

[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 f3541a2e628d28e75a9c65346d581ce484645f72..f2d964bb77ba0acb2554a40401c5ea11ee76843e 100644 (file)
--- a/libs/ardour/midi_patch_manager.cc
+++ b/libs/ardour/midi_patch_manager.cc
@@ -29,10 +29,6 @@
 #include "ardour/session_directory.h"
 #include "ardour/midi_patch_manager.h"
 
-#ifdef SearchPath
-#undef SearchPath
-#endif
-
 #include "ardour/midi_patch_search_path.h"
 
 #include "i18n.h"
@@ -107,7 +103,7 @@ MidiPatchManager::refresh()
        _master_devices_by_model.clear();
        _all_models.clear();
 
-       SearchPath search_path = midi_patch_search_path ();
+       Searchpath search_path = midi_patch_search_path ();
        Glib::PatternSpec pattern (string("*.midnam"));
        vector<std::string> result;