smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 04:39:33 +01:00
Code Issues Projects Releases Wiki Activity

Rename SearchPath class Searchpath

Browse source 
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.
This commit is contained in:
Tim Mayberry 2013-08-15 20:04:08 +10:00
parent e6c7ecf0e3
commit 8ddd12a60d
46 changed files with 125 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libs/surfaces/generic_midi/generic_midi_control_protocol.cc
View file

@ -106,7 +106,7 @@ static const char * const midimap_env_variable_name = "ARDOUR_MIDIMAPS_PATH";
static const char* const midi_map_dir_name = "midi_maps";
static const char* const midi_map_suffix = ".map";
SearchPath
Searchpath
system_midi_map_search_path ()
{
bool midimap_path_defined = false;
@ -116,7 +116,7 @@ system_midi_map_search_path ()
return spath_env;
}
SearchPath spath (ardour_data_search_path());
Searchpath spath (ardour_data_search_path());
spath.add_subdirectory_to_paths(midi_map_dir_name);
return spath;
}
@ -139,7 +139,7 @@ GenericMidiControlProtocol::reload_maps ()
{
vector<string *> *midi_maps;
PathScanner scanner;
SearchPath spath (system_midi_map_search_path());
Searchpath spath (system_midi_map_search_path());
spath += user_midi_map_directory ();
midi_maps = scanner (spath.to_string(), midi_map_filter, 0, false, true);