summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_patch_manager.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2013-08-15 20:04:08 +1000
committerTim Mayberry <mojofunk@gmail.com>2013-09-06 14:31:11 +1000
commit8ddd12a60d08d895cb5400013cdda2e893fb81bb (patch)
tree84c0082083295835e33c38c12acc5e21cb9b7c7e /libs/ardour/midi_patch_manager.cc
parente6c7ecf0e369ba886a7dc57a195226921f0f11f1 (diff)
Rename SearchPath class Searchpath
Windows headers define SearchPath which means we have to undefine it where necessary. This is a pain and can be tricksy, so I feel renaming the class slightly is the easiest solution.
Diffstat (limited to 'libs/ardour/midi_patch_manager.cc')
-rw-r--r--libs/ardour/midi_patch_manager.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc
index f3541a2e62..f2d964bb77 100644
--- 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;