diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2013-08-15 20:04:08 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2013-09-06 14:31:11 +1000 |
| commit | 8ddd12a60d08d895cb5400013cdda2e893fb81bb (patch) | |
| tree | 84c0082083295835e33c38c12acc5e21cb9b7c7e /libs/ardour/session.cc | |
| parent | e6c7ecf0e369ba886a7dc57a195226921f0f11f1 (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/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 9817f17069..428a5e5274 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -94,10 +94,6 @@ #include "i18n.h" -#ifdef SearchPath -#undef SearchPath -#endif - namespace ARDOUR { class MidiSource; class Processor; @@ -4434,7 +4430,7 @@ Session::end_time_changed (framepos_t old) std::vector<std::string> Session::source_search_path (DataType type) const { - SearchPath sp; + Searchpath sp; if (session_dirs.size() == 1) { switch (type) { @@ -4472,10 +4468,10 @@ Session::source_search_path (DataType type) const switch (type) { case DataType::AUDIO: - sp += SearchPath(config.get_audio_search_path ()); + sp += Searchpath(config.get_audio_search_path ()); break; case DataType::MIDI: - sp += SearchPath(config.get_midi_search_path ()); + sp += Searchpath(config.get_midi_search_path ()); break; } @@ -4485,7 +4481,7 @@ Session::source_search_path (DataType type) const void Session::ensure_search_path_includes (const string& path, DataType type) { - SearchPath sp; + Searchpath sp; if (path == ".") { return; @@ -4493,10 +4489,10 @@ Session::ensure_search_path_includes (const string& path, DataType type) switch (type) { case DataType::AUDIO: - sp += SearchPath(config.get_audio_search_path ()); + sp += Searchpath(config.get_audio_search_path ()); break; case DataType::MIDI: - sp += SearchPath (config.get_midi_search_path ()); + sp += Searchpath (config.get_midi_search_path ()); break; } |