X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_timespan_selector.h;h=688971554d134d68442782933b24627539f0b2db;hb=89d6f40e33933b12a40079e391a96856bfa79e2a;hp=5d299e1e52cd25a4eb1f93bc4a02159b5f5fbc67;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index 5d299e1e52..688971554d 100644
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/gtk2_ardour/export_timespan_selector.h
@@ -76,12 +76,13 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 
 	void change_time_format ();
 
-	Glib::ustring construct_label (ARDOUR::Location const * location) const;
-	Glib::ustring bbt_str (nframes_t frames) const;
-	Glib::ustring timecode_str (nframes_t frames) const;
-	Glib::ustring ms_str (nframes_t frames) const;
+	std::string construct_label (ARDOUR::Location const * location) const;
+	std::string construct_length (ARDOUR::Location const * location) const;
+	std::string bbt_str (framepos_t frames) const;
+	std::string timecode_str (framecnt_t frames) const;
+	std::string ms_str (framecnt_t frames) const;
 
-	void update_range_name (Glib::ustring const & path, Glib::ustring const & new_text);
+	void update_range_name (std::string const & path, std::string const & new_text);
 
 	/*** GUI components ***/
 
@@ -96,7 +97,7 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 	{
 	  public:
 		Gtk::TreeModelColumn<TimeFormat>      format;
-		Gtk::TreeModelColumn<Glib::ustring>   label;
+		Gtk::TreeModelColumn<std::string>   label;
 
 		TimeFormatCols () { add(format); add(label); }
 	};
@@ -110,11 +111,12 @@ class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
 	{
 	  public:
 		Gtk::TreeModelColumn<ARDOUR::Location *>  location;
-		Gtk::TreeModelColumn<Glib::ustring>       label;
-		Gtk::TreeModelColumn<bool>                selected;
-		Gtk::TreeModelColumn<Glib::ustring>       name;
+		Gtk::TreeModelColumn<std::string>       label;
+		Gtk::TreeModelColumn<bool>              selected;
+		Gtk::TreeModelColumn<std::string>       name;
+		Gtk::TreeModelColumn<std::string>       length;
 
-		RangeCols () { add (location); add(label); add(selected); add(name); }
+		RangeCols () { add (location); add(label); add(selected); add(name); add(length); }
 	};
 	RangeCols                    range_cols;
 
@@ -143,13 +145,13 @@ class ExportTimespanSelectorMultiple : public ExportTimespanSelector
 class ExportTimespanSelectorSingle : public ExportTimespanSelector
 {
   public:
-	ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, Glib::ustring range_id);
+	ExportTimespanSelectorSingle (ARDOUR::Session * session, ProfileManagerPtr manager, std::string range_id);
 
   private:
 
 	virtual void fill_range_list ();
 
-	Glib::ustring range_id;
+	std::string range_id;
 
 };