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 /gtk2_ardour | |
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 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/about.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/actions.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 8 | ||||
-rw-r--r-- | gtk2_ardour/editor_actions.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/editor_export_audio.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_snapshots.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/keyboard.cc | 5 | ||||
-rw-r--r-- | gtk2_ardour/main.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/mixer_actor.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/nag.cc | 12 | ||||
-rw-r--r-- | gtk2_ardour/sfdb_ui.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/splash.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/startup.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/step_entry.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/theme_manager.cc | 6 | ||||
-rw-r--r-- | gtk2_ardour/ui_config.cc | 12 | ||||
-rw-r--r-- | gtk2_ardour/utils.cc | 8 |
17 files changed, 48 insertions, 49 deletions
diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 571f602e71..ab791aa555 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -553,15 +553,14 @@ About::About () { // set_type_hint(Gdk::WINDOW_TYPE_HINT_SPLASHSCREEN); - string path; string t; - sys::path splash_file; + std::string splash_file; SearchPath spath(ardour_data_search_path()); if (find_file_in_search_path (spath, "splash.png", splash_file)) { - set_logo (Gdk::Pixbuf::create_from_file (splash_file.to_string())); + set_logo (Gdk::Pixbuf::create_from_file (splash_file)); } else { error << "Could not find splash file" << endmsg; } diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 5391d58f42..343dd20308 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -67,7 +67,7 @@ vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actio void ActionManager::init () { - sys::path ui_file; + std::string ui_file; ui_manager = UIManager::create (); @@ -76,8 +76,8 @@ ActionManager::init () bool loaded = false; try { - ui_manager->add_ui_from_file (ui_file.to_string()); - info << string_compose (_("Loading menus from %1"), ui_file.to_string()) << endmsg; + ui_manager->add_ui_from_file (ui_file); + info << string_compose (_("Loading menus from %1"), ui_file) << endmsg; loaded = true; } catch (Glib::MarkupError& err) { error << string_compose (_("badly formatted UI definition file: %1"), err.what()) << endmsg; diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index b3976f581d..cc5837d7ad 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1134,11 +1134,11 @@ ARDOUR_UI::redisplay_recent_sessions () for (vector<sys::path>::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i) { - std::vector<sys::path> state_file_paths; + std::vector<std::string> state_file_paths; // now get available states for this session - get_state_files_in_directory (*i, state_file_paths); + get_state_files_in_directory (i->to_string(), state_file_paths); vector<string*>* states; vector<const gchar*> item; @@ -2074,7 +2074,7 @@ ARDOUR_UI::snapshot_session (bool switch_to_it) } } - vector<sys::path> p; + vector<std::string> p; get_state_files_in_directory (_session->session_directory().root_path(), p); vector<string> n = get_file_names_no_extension (p); if (find (n.begin(), n.end(), snapname) != n.end()) { @@ -2913,7 +2913,7 @@ require some unused files to continue to exist.")); dimage->set_alignment(ALIGN_LEFT, ALIGN_TOP); - const string dead_directory = _session->session_directory().dead_path().to_string(); + const string dead_directory = _session->session_directory().dead_path(); /* subst: %1 - number of files removed diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 00ea296e61..d0e1023362 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -641,11 +641,11 @@ Editor::load_bindings () key_bindings.set_action_map (editor_action_map); - sys::path binding_file; + std::string binding_file; if (find_file_in_search_path (ardour_config_search_path(), "editor.bindings", binding_file)) { - key_bindings.load (binding_file.to_string()); - info << string_compose (_("Loaded editor bindings from %1"), binding_file.to_string()) << endmsg; + key_bindings.load (binding_file); + info << string_compose (_("Loaded editor bindings from %1"), binding_file) << endmsg; } else { error << string_compose (_("Could not find editor.bindings in search path %1"), ardour_config_search_path().to_string()) << endmsg; } diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 509e629aee..94f43a0e5e 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -232,7 +232,7 @@ Editor::write_region (string path, boost::shared_ptr<AudioRegion> region) vector<boost::shared_ptr<AudioFileSource> > sources; uint32_t nchans; - const string sound_directory = _session->session_directory().sound_path().to_string(); + const string sound_directory = _session->session_directory().sound_path(); nchans = region->n_channels(); @@ -382,7 +382,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list string path; vector<boost::shared_ptr<AudioFileSource> > sources; - const string sound_directory = _session->session_directory().sound_path().to_string(); + const string sound_directory = _session->session_directory().sound_path(); uint32_t channels = count.n_audio(); diff --git a/gtk2_ardour/editor_snapshots.cc b/gtk2_ardour/editor_snapshots.cc index 093e21952f..08b5acddc8 100644 --- a/gtk2_ardour/editor_snapshots.cc +++ b/gtk2_ardour/editor_snapshots.cc @@ -173,7 +173,7 @@ EditorSnapshots::redisplay () return; } - vector<sys::path> state_file_paths; + vector<std::string> state_file_paths; get_state_files_in_directory (_session->session_directory().root_path(), state_file_paths); diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc index 2fbd5812ad..732118f338 100644 --- a/gtk2_ardour/keyboard.cc +++ b/gtk2_ardour/keyboard.cc @@ -19,6 +19,7 @@ #include "pbd/error.h" #include "pbd/file_utils.h" +#include "pbd/filesystem.h" #include "ardour/filesystem_paths.h" @@ -124,7 +125,7 @@ ArdourKeyboard::setup_keybindings () if (!Glib::path_is_absolute (keybindings_path)) { /* not absolute - look in the usual places */ - sys::path keybindings_file; + std::string keybindings_file; if ( ! find_file_in_search_path (ardour_config_search_path(), keybindings_path, keybindings_file)) { @@ -142,7 +143,7 @@ ArdourKeyboard::setup_keybindings () /* use it */ - keybindings_path = keybindings_file.to_string(); + keybindings_path = keybindings_file; break; } diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 407be09068..e334043a77 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -222,7 +222,7 @@ fixup_bundle_environment (int /*argc*/, char* argv[]) std::string path; std::string dir_path = Glib::path_get_dirname (Glib::path_get_dirname (argv[0])); - std::string userconfigdir = user_config_directory().to_string(); + std::string userconfigdir = user_config_directory(); /* note that this function is POSIX/Linux specific, so using / as a dir separator in this context is just fine. diff --git a/gtk2_ardour/mixer_actor.cc b/gtk2_ardour/mixer_actor.cc index 437da39bab..9922195abe 100644 --- a/gtk2_ardour/mixer_actor.cc +++ b/gtk2_ardour/mixer_actor.cc @@ -82,11 +82,11 @@ MixerActor::load_bindings () bindings.set_action_map (myactions); - sys::path binding_file; + std::string binding_file; if (find_file_in_search_path (ardour_config_search_path(), "mixer.bindings", binding_file)) { - bindings.load (binding_file.to_string()); - info << string_compose (_("Loaded mixer bindings from %1"), binding_file.to_string()) << endmsg; + bindings.load (binding_file); + info << string_compose (_("Loaded mixer bindings from %1"), binding_file) << endmsg; } else { error << string_compose (_("Could not find mixer.bindings in search path %1"), ardour_config_search_path().to_string()) << endmsg; } diff --git a/gtk2_ardour/nag.cc b/gtk2_ardour/nag.cc index 110a977716..5d93d13267 100644 --- a/gtk2_ardour/nag.cc +++ b/gtk2_ardour/nag.cc @@ -94,7 +94,7 @@ NagScreen::maybe_nag (std::string why) bool really_subscribed; bool maybe_subscribed; - path = Glib::build_filename (user_config_directory().to_string(), ".nevernag"); + path = Glib::build_filename (user_config_directory(), ".nevernag"); if (Glib::file_test (path, Glib::FILE_TEST_EXISTS)) { return 0; @@ -114,7 +114,7 @@ NagScreen::mark_never_again () { std::string path; - path = Glib::build_filename (user_config_directory().to_string(), ".nevernag"); + path = Glib::build_filename (user_config_directory(), ".nevernag"); ofstream nagfile (path.c_str()); } @@ -124,7 +124,7 @@ NagScreen::mark_subscriber () { std::string path; - path = Glib::build_filename (user_config_directory().to_string(), ".askedaboutsub"); + path = Glib::build_filename (user_config_directory(), ".askedaboutsub"); ofstream subsfile (path.c_str()); } @@ -134,7 +134,7 @@ NagScreen::mark_affirmed_subscriber () { std::string path; - path = Glib::build_filename (user_config_directory().to_string(), ".isubscribe"); + path = Glib::build_filename (user_config_directory(), ".isubscribe"); ofstream subsfile (path.c_str()); } @@ -152,13 +152,13 @@ NagScreen::is_subscribed (bool& really) subscribed. we try to trust our users :) */ - path = Glib::build_filename (user_config_directory().to_string(), ".isubscribe"); + path = Glib::build_filename (user_config_directory(), ".isubscribe"); if (file_test (path, FILE_TEST_EXISTS)) { really = true; return true; } - path = Glib::build_filename (user_config_directory().to_string(), ".askedaboutsub"); + path = Glib::build_filename (user_config_directory(), ".askedaboutsub"); if (file_test (path, FILE_TEST_EXISTS)) { /* they never said they were subscribed but they did once express an interest in it. diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc index bff119d29d..55b6cc2407 100644 --- a/gtk2_ardour/sfdb_ui.cc +++ b/gtk2_ardour/sfdb_ui.cc @@ -1301,8 +1301,7 @@ SoundFileOmega::check_info (const vector<string>& paths, bool& same_size, bool& bool SoundFileOmega::check_link_status (const Session* s, const vector<string>& paths) { - sys::path path = s->session_directory().sound_path() / "linktest"; - string tmpdir = path.to_string(); + std::string tmpdir(Glib::build_filename (s->session_directory().sound_path(), "linktest")); bool ret = false; if (mkdir (tmpdir.c_str(), 0744)) { diff --git a/gtk2_ardour/splash.cc b/gtk2_ardour/splash.cc index 6cc4cd5ded..5643adbd6a 100644 --- a/gtk2_ardour/splash.cc +++ b/gtk2_ardour/splash.cc @@ -41,14 +41,14 @@ Splash::Splash () { assert (the_splash == 0); - sys::path splash_file; + std::string splash_file; if (!find_file_in_search_path (ardour_data_search_path(), "splash.png", splash_file)) { throw failed_constructor(); } try { - pixbuf = Gdk::Pixbuf::create_from_file (splash_file.to_string()); + pixbuf = Gdk::Pixbuf::create_from_file (splash_file); } catch (...) { diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index b1044dfc70..26f4afafa0 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -933,11 +933,11 @@ ArdourStartup::redisplay_recent_sessions () for (vector<sys::path>::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i) { - std::vector<sys::path> state_file_paths; + std::vector<std::string> state_file_paths; // now get available states for this session - get_state_files_in_directory (*i, state_file_paths); + get_state_files_in_directory ((*i).to_string (), state_file_paths); vector<string*>* states; vector<const gchar*> item; diff --git a/gtk2_ardour/step_entry.cc b/gtk2_ardour/step_entry.cc index 8e8bd3a3fa..9199439760 100644 --- a/gtk2_ardour/step_entry.cc +++ b/gtk2_ardour/step_entry.cc @@ -708,10 +708,10 @@ StepEntry::load_bindings () bindings.set_action_map (myactions); - sys::path binding_file; + std::string binding_file; if (find_file_in_search_path (ardour_config_search_path(), "step_editing.bindings", binding_file)) { - bindings.load (binding_file.to_string()); + bindings.load (binding_file); } } diff --git a/gtk2_ardour/theme_manager.cc b/gtk2_ardour/theme_manager.cc index 71300ad07d..5df00faf98 100644 --- a/gtk2_ardour/theme_manager.cc +++ b/gtk2_ardour/theme_manager.cc @@ -202,7 +202,7 @@ ThemeManager::button_press_event (GdkEventButton* ev) void load_rc_file (const string& filename, bool themechange) { - sys::path rc_file_path; + std::string rc_file_path; if (!find_file_in_search_path (ardour_config_search_path(), filename, rc_file_path)) { warning << string_compose (_("Unable to find UI style file %1 in search path %2. %3 will look strange"), @@ -211,9 +211,9 @@ load_rc_file (const string& filename, bool themechange) return; } - info << "Loading ui configuration file " << rc_file_path.to_string() << endmsg; + info << "Loading ui configuration file " << rc_file_path << endmsg; - Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path.to_string(), themechange); + Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange); } /* hmm, this is a problem. the profile doesn't diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index b17316e2db..ff49301419 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -65,7 +65,7 @@ UIConfiguration::load_defaults () { int found = 0; - sys::path default_ui_rc_file; + std::string default_ui_rc_file; std::string rcfile; if (getenv ("ARDOUR_SAE")) { @@ -78,7 +78,7 @@ UIConfiguration::load_defaults () XMLTree tree; found = 1; - string rcfile = default_ui_rc_file.to_string(); + string rcfile = default_ui_rc_file; info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; @@ -103,13 +103,13 @@ UIConfiguration::load_state () { bool found = false; - sys::path default_ui_rc_file; + std::string default_ui_rc_file; if ( find_file_in_search_path (ardour_config_search_path(), "ardour3_ui_default.conf", default_ui_rc_file)) { XMLTree tree; found = true; - string rcfile = default_ui_rc_file.to_string(); + string rcfile = default_ui_rc_file; info << string_compose (_("Loading default ui configuration file %1"), rcfile) << endl; @@ -124,13 +124,13 @@ UIConfiguration::load_state () } } - sys::path user_ui_rc_file; + std::string user_ui_rc_file; if (find_file_in_search_path (ardour_config_search_path(), "ardour3_ui.conf", user_ui_rc_file)) { XMLTree tree; found = true; - string rcfile = user_ui_rc_file.to_string(); + string rcfile = user_ui_rc_file; info << string_compose (_("Loading user ui configuration file %1"), rcfile) << endmsg; diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index b8594b7b2f..905ecd78f9 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -498,14 +498,14 @@ get_xpm (std::string name) spath.add_subdirectory_to_paths("pixmaps"); - sys::path data_file_path; + std::string data_file_path; if(!find_file_in_search_path (spath, name, data_file_path)) { fatal << string_compose (_("cannot find XPM file for %1"), name) << endmsg; } try { - xpm_map[name] = Gdk::Pixbuf::create_from_file (data_file_path.to_string()); + xpm_map[name] = Gdk::Pixbuf::create_from_file (data_file_path); } catch(const Glib::Error& e) { warning << "Caught Glib::Error: " << e.what() << endmsg; } @@ -524,13 +524,13 @@ get_icon_path (const char* cname) spath.add_subdirectory_to_paths("icons"); - sys::path data_file_path; + std::string data_file_path; if (!find_file_in_search_path (spath, name, data_file_path)) { fatal << string_compose (_("cannot find icon image for %1 using %2"), name, spath.to_string()) << endmsg; } - return data_file_path.to_string(); + return data_file_path; } Glib::RefPtr<Gdk::Pixbuf> |