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/ardour/sndfilesource.h | |
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/ardour/sndfilesource.h')
-rw-r--r-- | libs/ardour/ardour/sndfilesource.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h index 151889dbb5..59dd603236 100644 --- a/libs/ardour/ardour/sndfilesource.h +++ b/libs/ardour/ardour/sndfilesource.h @@ -31,10 +31,10 @@ namespace ARDOUR { class SndFileSource : public AudioFileSource { public: /** Constructor to be called for existing external-to-session files */ - SndFileSource (Session&, const Glib::ustring& path, int chn, Flag flags); + SndFileSource (Session&, const std::string& path, int chn, Flag flags); /* Constructor to be called for new in-session files */ - SndFileSource (Session&, const Glib::ustring& path, + SndFileSource (Session&, const std::string& path, SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, Flag flags = SndFileSource::default_writable_flags); @@ -63,7 +63,7 @@ class SndFileSource : public AudioFileSource { static void setup_standard_crossfades (Session const &, nframes_t sample_rate); static const Source::Flag default_writable_flags; - static int get_soundfile_info (const Glib::ustring& path, SoundFileInfo& _info, std::string& error_msg); + static int get_soundfile_info (const std::string& path, SoundFileInfo& _info, std::string& error_msg); protected: void set_path (const std::string& p); |