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/import.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/import.cc')
| -rw-r--r-- | libs/ardour/import.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/import.cc b/libs/ardour/import.cc index d1a4a5cad4..784fedefdb 100644 --- a/libs/ardour/import.cc +++ b/libs/ardour/import.cc @@ -240,7 +240,7 @@ create_mono_sources_for_writing (const vector<string>& new_paths, Session& sess, return true; } -static Glib::ustring +static string compose_status_message (const string& path, uint file_samplerate, uint session_samplerate, @@ -448,7 +448,7 @@ Session::import_audiofiles (ImportStatus& status) status.sources.clear (); - for (vector<Glib::ustring>::iterator p = status.paths.begin(); + for (vector<string>::iterator p = status.paths.begin(); p != status.paths.end() && !status.cancel; ++p) { |