diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:06:54 +0000 |
| commit | 105caf23daf5aed16c7ee8b904fcca2ddbd4f59f (patch) | |
| tree | 4d74f6c8722790e6fb9d58888ea225866fc98d3c /libs/surfaces/generic_midi | |
| parent | 22e478e7fc4952dd386391e85d8e7fa2491ae953 (diff) | |
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
Diffstat (limited to 'libs/surfaces/generic_midi')
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index 0a158f29ca..57705e6777 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -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); |