X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_timespan_selector.h;h=8b06b2ee8d04cedc835a9d6c1b691672f9d8d781;hb=153ee4e441eeebc9aceaa3121e4a785c6011a962;hp=72d5990422a5ed624ae0adaffdf93ce66a87d424;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index 72d5990422..8b06b2ee8d 100644
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/gtk2_ardour/export_timespan_selector.h
@@ -30,26 +30,26 @@
 #include <boost/shared_ptr.hpp>
 
 #include "ardour/types.h"
+#include "ardour/session_handle.h"
 #include "ardour/export_profile_manager.h"
 
 namespace ARDOUR {
 	class Location;
 	class ExportTimespan;
 	class ExportHandler;
-	class Session;
 }
 
 using ARDOUR::CDMarkerFormat;
 
 /// Timespan Selector base
-class ExportTimespanSelector : public Gtk::VBox {
+class ExportTimespanSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
+{
   protected:
 	typedef std::list<ARDOUR::Location *> LocationList;
 	typedef boost::shared_ptr<ARDOUR::ExportHandler> HandlerPtr;
 	typedef boost::shared_ptr<ARDOUR::ExportProfileManager> ProfileManagerPtr;
 
-	typedef boost::shared_ptr<ARDOUR::ExportTimespan> TimespanPtr;
-	typedef std::list<TimespanPtr> TimespanList;
+	typedef std::list<ARDOUR::ExportTimespanPtr> TimespanList;
 	typedef boost::shared_ptr<TimespanList> TimespanListPtr;
 	typedef ARDOUR::ExportProfileManager::TimespanStatePtr TimespanStatePtr;
 
@@ -65,7 +65,6 @@ class ExportTimespanSelector : public Gtk::VBox {
 
   protected:
 
-	ARDOUR::Session * session;
 	ProfileManagerPtr manager;
 	TimespanStatePtr  state;
 
@@ -76,12 +75,13 @@ class ExportTimespanSelector : public Gtk::VBox {
 
 	void change_time_format ();
 
-	Glib::ustring construct_label (ARDOUR::Location const * location) const;
-	Glib::ustring bbt_str (nframes_t frames) const;
-	Glib::ustring smpte_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 +96,7 @@ class ExportTimespanSelector : public Gtk::VBox {
 	{
 	  public:
 		Gtk::TreeModelColumn<TimeFormat>      format;
-		Gtk::TreeModelColumn<Glib::ustring>   label;
+		Gtk::TreeModelColumn<std::string>   label;
 
 		TimeFormatCols () { add(format); add(label); }
 	};
@@ -110,11 +110,12 @@ class ExportTimespanSelector : public Gtk::VBox {
 	{
 	  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 +144,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;
 
 };