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/smf_source.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/smf_source.h')
| -rw-r--r-- | libs/ardour/ardour/smf_source.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index ab62a2d211..165e03e483 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -37,7 +37,7 @@ template<typename T> class MidiRingBuffer; class SMFSource : public MidiSource, public FileSource, public Evoral::SMF { public: /** Constructor for existing external-to-session files */ - SMFSource (Session& session, const Glib::ustring& path, + SMFSource (Session& session, const std::string& path, Source::Flag flags = Source::Flag(0)); /** Constructor for existing in-session files */ @@ -45,7 +45,7 @@ public: virtual ~SMFSource (); - bool safe_file_extension (const Glib::ustring& path) const { + bool safe_file_extension (const std::string& path) const { return safe_midi_file_extension(path); } @@ -67,7 +67,7 @@ public: static void set_header_position_offset (nframes_t offset, bool negative); - static bool safe_midi_file_extension (const Glib::ustring& path); + static bool safe_midi_file_extension (const std::string& path); protected: void set_path (const std::string& newpath); |