diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:09:46 +0000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2012-06-23 05:09:46 +0000 |
| commit | 218b63cc37ddb4a611e040e408e71b74bea8e6bb (patch) | |
| tree | fe0bef5b5f758880ac46cb2366582b97a851b78a /gtk2_ardour/startup.cc | |
| parent | 4b96a5b34de67b99cb89e34466a63bcac97fef42 (diff) | |
Use std::string and Glib::build_filename in gtk2_ardour
git-svn-id: svn://localhost/ardour2/branches/3.0@12903 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/startup.cc')
| -rw-r--r-- | gtk2_ardour/startup.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 689312baa2..a811fd7cc1 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -29,7 +29,6 @@ #include "pbd/failed_constructor.h" #include "pbd/file_utils.h" -#include "pbd/filesystem.h" #include "pbd/replace_all.h" #include "pbd/whitespace.h" @@ -123,7 +122,7 @@ Ardour will play NO role in monitoring")) set_default_icon_list (window_icons); } - new_user = !Glib::file_test(been_here_before_path().to_string(), Glib::FILE_TEST_EXISTS); + new_user = !Glib::file_test(been_here_before_path(), Glib::FILE_TEST_EXISTS); bool need_audio_setup = !EngineControl::engine_running(); @@ -642,7 +641,7 @@ ArdourStartup::on_apply () Config->set_use_monitor_bus (use_monitor_section_button.get_active()); /* "touch" the been-here-before path now that we're about to save Config */ - ofstream fout (been_here_before_path().to_string().c_str()); + ofstream fout (been_here_before_path().c_str()); Config->save_state (); } @@ -901,7 +900,7 @@ ArdourStartup::new_name_changed () int ArdourStartup::redisplay_recent_sessions () { - std::vector<sys::path> session_directories; + std::vector<std::string> session_directories; RecentSessionsSorter cmp; recent_session_display.set_model (Glib::RefPtr<TreeModel>(0)); @@ -922,17 +921,17 @@ ArdourStartup::redisplay_recent_sessions () session_directories.push_back ((*i).second); } - for (vector<sys::path>::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i) + for (vector<std::string>::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i) { std::vector<std::string> state_file_paths; // now get available states for this session - get_state_files_in_directory ((*i).to_string (), state_file_paths); + get_state_files_in_directory (*i, state_file_paths); vector<string*>* states; vector<const gchar*> item; - string fullpath = (*i).to_string(); + string fullpath = *i; /* remove any trailing / */ @@ -1393,11 +1392,9 @@ ArdourStartup::existing_session_selected () move_along_now (); } -sys::path +std::string ArdourStartup::been_here_before_path () const { - sys::path b = user_config_directory(); - b /= ".a3"; // XXXX use more specific version so we can catch upgrades - return b; + // XXXX use more specific version so we can catch upgrades + return Glib::build_filename (user_config_directory (), ".a3"); } - |