diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-14 15:45:21 +0000 |
| commit | 4d112a8e6b90fa64a5cd333042044768111ba994 (patch) | |
| tree | 6688c5250bc55de106f74ef9be93d7ee574ec9d8 /libs/ardour/session.cc | |
| parent | 875f0befd5fb52678d25544fcbcb6e6b55a2c483 (diff) | |
remove Glib::ustring from libardour; allow any characters except '/' and '\' in paths (may cause issues when loading creatively named 2.X sessions; fix a couple of details of name collection and usage from the startup dialog
git-svn-id: svn://localhost/ardour2/branches/3.0@7772 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 6e4f6295a1..f68da4adb2 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2719,7 +2719,7 @@ Session::source_by_id (const PBD::ID& id) } boost::shared_ptr<Source> -Session::source_by_path_and_channel (const Glib::ustring& path, uint16_t chn) +Session::source_by_path_and_channel (const string& path, uint16_t chn) { Glib::Mutex::Lock lm (source_lock); @@ -2865,8 +2865,8 @@ Session::new_source_path_from_name (DataType type, const string& name, bool as_s return p.to_string(); } -Glib::ustring -Session::peak_path (Glib::ustring base) const +string +Session::peak_path (string base) const { sys::path peakfile_path(_session_dir->peak_path()); peakfile_path /= basename_nosuffix (base) + peakfile_suffix; |