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/sndfilesource.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/sndfilesource.cc')
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 9ab647e98e..1cc8edd708 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -44,7 +44,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -using Glib::ustring; +using std::string; gain_t* SndFileSource::out_coefficient = 0; gain_t* SndFileSource::in_coefficient = 0; @@ -67,7 +67,7 @@ SndFileSource::SndFileSource (Session& s, const XMLNode& node) } /** Files created this way are never writable or removable */ -SndFileSource::SndFileSource (Session& s, const ustring& path, int chn, Flag flags) +SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flags) : Source(s, DataType::AUDIO, path, flags) , AudioFileSource (s, path, Flag (flags & ~(Writable|Removable|RemovableIfEmpty|RemoveAtDestroy))) { @@ -81,7 +81,7 @@ SndFileSource::SndFileSource (Session& s, const ustring& path, int chn, Flag fla } /** This constructor is used to construct new files, not open existing ones. */ -SndFileSource::SndFileSource (Session& s, const ustring& path, +SndFileSource::SndFileSource (Session& s, const string& path, SampleFormat sfmt, HeaderFormat hf, nframes_t rate, Flag flags) : Source(s, DataType::AUDIO, path, flags) , AudioFileSource (s, path, flags, sfmt, hf) @@ -178,7 +178,7 @@ SndFileSource::SndFileSource (Session& s, const ustring& path, void SndFileSource::init_sndfile () { - ustring file; + string file; // lets try to keep the object initalizations here at the top xfade_buf = 0; @@ -830,7 +830,7 @@ SndFileSource::set_timeline_position (int64_t pos) } int -SndFileSource::get_soundfile_info (const ustring& path, SoundFileInfo& info, string& error_msg) +SndFileSource::get_soundfile_info (const string& path, SoundFileInfo& info, string& error_msg) { SNDFILE *sf; SF_INFO sf_info; |