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/export_formats.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/export_formats.h')
-rw-r--r-- | libs/ardour/ardour/export_formats.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h index 03585f79a9..c29f7a4fbf 100644 --- a/libs/ardour/ardour/export_formats.h +++ b/libs/ardour/ardour/export_formats.h @@ -91,7 +91,7 @@ class HasSampleFormat : public PBD::ScopedConnectionList { class SampleFormatState : public ExportFormatBase::SelectableCompatible { public: - SampleFormatState (ExportFormatBase::SampleFormat format, Glib::ustring name) : + SampleFormatState (ExportFormatBase::SampleFormat format, std::string name) : format (format) { set_name (name); } ExportFormatBase::SampleFormat format; @@ -145,7 +145,7 @@ class HasSampleFormat : public PBD::ScopedConnectionList { private: /* Connected to signals */ - void add_dither_type (ExportFormatBase::DitherType type, Glib::ustring name); + void add_dither_type (ExportFormatBase::DitherType type, std::string name); void update_sample_format_selection (bool); void update_dither_type_selection (bool); @@ -156,7 +156,7 @@ class HasSampleFormat : public PBD::ScopedConnectionList { class ExportFormatLinear : public ExportFormat, public HasSampleFormat { public: - ExportFormatLinear (Glib::ustring name, FormatId format_id); + ExportFormatLinear (std::string name, FormatId format_id); ~ExportFormatLinear () {}; bool set_compatibility_state (ExportFormatCompatibility const & compatibility); |