Use std::string instead of PBD::sys::path in pbd/search_path.h, pbd/file_utils.h and ardour/session_dir.h

git-svn-id: svn://localhost/ardour2/branches/3.0@12829 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Tim Mayberry 2012-06-23 05:06:54 +00:00
parent 22e478e7fc
commit 105caf23da
54 changed files with 255 additions and 309 deletions

View file

@ -29,6 +29,7 @@
#include "pbd/failed_constructor.h"
#include "pbd/pathscanner.h"
#include "pbd/xml++.h"
#include "pbd/filesystem.h"
#include "midi++/port.h"
#include "midi++/manager.h"
@ -147,8 +148,8 @@ GenericMidiControlProtocol::reload_maps ()
{
vector<string *> *midi_maps;
PathScanner scanner;
SearchPath spath (system_midi_map_search_path());
spath += user_midi_map_directory ();
SearchPath spath (system_midi_map_search_path().to_string());
spath += user_midi_map_directory ().to_string();
midi_maps = scanner (spath.to_string(), midi_map_filter, 0, false, true);