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/ardour/rc_configuration.cc | |
| 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/ardour/rc_configuration.cc')
| -rw-r--r-- | libs/ardour/rc_configuration.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index d2290c73d5..f0723d46ad 100644 --- a/libs/ardour/rc_configuration.cc +++ b/libs/ardour/rc_configuration.cc @@ -77,13 +77,12 @@ RCConfiguration::~RCConfiguration () int RCConfiguration::load_state () { - sys::path system_rc_file; + std::string rcfile; struct stat statbuf; /* load system configuration first */ - if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", system_rc_file)) { - string rcfile = system_rc_file.to_string(); + if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", rcfile)) { /* stupid XML Parser hates empty files */ @@ -111,10 +110,7 @@ RCConfiguration::load_state () /* now load configuration file for user */ - sys::path user_rc_file; - - if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", user_rc_file)) { - string rcfile = user_rc_file.to_string(); + if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", rcfile)) { /* stupid XML parser hates empty files */ |