From 4d112a8e6b90fa64a5cd333042044768111ba994 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 14 Sep 2010 15:45:21 +0000 Subject: 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 --- libs/ardour/ardour/export_timespan.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'libs/ardour/ardour/export_timespan.h') diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h index 9053ace0f9..592f36b1a9 100644 --- a/libs/ardour/ardour/export_timespan.h +++ b/libs/ardour/ardour/export_timespan.h @@ -23,8 +23,7 @@ #include #include - -#include +#include #include "ardour/export_status.h" #include "ardour/export_channel.h" @@ -48,11 +47,11 @@ class ExportTimespan public: ~ExportTimespan (); - Glib::ustring name () const { return _name; } - void set_name (Glib::ustring name) { _name = name; } + std::string name () const { return _name; } + void set_name (std::string name) { _name = name; } - Glib::ustring range_id () const { return _range_id; } - void set_range_id (Glib::ustring range_id) { _range_id = range_id; } + std::string range_id () const { return _range_id; } + void set_range_id (std::string range_id) { _range_id = range_id; } void set_range (nframes_t start, nframes_t end); nframes_t get_length () const { return end_frame - start_frame; } @@ -68,8 +67,8 @@ class ExportTimespan nframes_t position; nframes_t frame_rate; - Glib::ustring _name; - Glib::ustring _range_id; + std::string _name; + std::string _range_id; }; -- cgit v1.2.3