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

diff --git a/gtk2_ardour/export_timespan_selector.h b/gtk2_ardour/export_timespan_selector.h
index db1f4cd0e9..688971554d 100644
--- a/gtk2_ardour/export_timespan_selector.h
+++ b/gtk2_ardour/export_timespan_selector.h
@@ -30,92 +30,99 @@
 #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 {
-  public:
-
-	ExportTimespanSelector ();
-	virtual ~ExportTimespanSelector ();
-
-	void set_state (ARDOUR::ExportProfileManager::TimespanStatePtr const state_, ARDOUR::Session * session_);
-	
-	sigc::signal<void> CriticalSelectionChanged;
-
+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 boost::shared_ptr<TimespanList> TimespanListPtr;
+	typedef ARDOUR::ExportProfileManager::TimespanStatePtr TimespanStatePtr;
+
+  public:
+
+	ExportTimespanSelector (ARDOUR::Session * session, ProfileManagerPtr manager);
+
+	virtual ~ExportTimespanSelector ();
+
+	void sync_with_manager ();
+
+	sigc::signal<void> CriticalSelectionChanged;
 
-	ARDOUR::Session *                              session;
-	ARDOUR::ExportProfileManager::TimespanStatePtr state;
+  protected:
+
+	ProfileManagerPtr manager;
+	TimespanStatePtr  state;
 
 	virtual void fill_range_list () = 0;
-	
+
 	void add_range_to_selection (ARDOUR::Location const * loc);
 	void set_time_format_from_state ();
-	
+
 	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;
 
-	void update_range_name (Glib::ustring const & path, Glib::ustring const & new_text);
+	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 (std::string const & path, std::string const & new_text);
 
 	/*** GUI components ***/
-	
+
 	Gtk::HBox      option_hbox;
 	Gtk::Label     time_format_label;
-	
+
 	/* Time format */
-	
+
 	typedef ARDOUR::ExportProfileManager::TimeFormat TimeFormat;
-	
+
 	struct TimeFormatCols : public Gtk::TreeModelColumnRecord
 	{
 	  public:
 		Gtk::TreeModelColumn<TimeFormat>      format;
-		Gtk::TreeModelColumn<Glib::ustring>   label;
-	
+		Gtk::TreeModelColumn<std::string>   label;
+
 		TimeFormatCols () { add(format); add(label); }
 	};
 	TimeFormatCols               time_format_cols;
 	Glib::RefPtr<Gtk::ListStore> time_format_list;
 	Gtk::ComboBox                time_format_combo;
-	
+
 	/* View */
-	
+
 	struct RangeCols : public Gtk::TreeModelColumnRecord
 	{
 	  public:
 		Gtk::TreeModelColumn<ARDOUR::Location *>  location;
-		Gtk::TreeModelColumn<Glib::ustring>       label;
-		Gtk::TreeModelColumn<bool>                selected;
-		Gtk::TreeModelColumn<Glib::ustring>       name;
-	
-		RangeCols () { add (location); add(label); add(selected); add(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); add(length); }
 	};
 	RangeCols                    range_cols;
-	
+
 	Glib::RefPtr<Gtk::ListStore> range_list;
 	Gtk::TreeView                range_view;
-	
+
 	Gtk::ScrolledWindow          range_scroller;
 };
 
@@ -123,7 +130,7 @@ class ExportTimespanSelector : public Gtk::VBox {
 class ExportTimespanSelectorMultiple : public ExportTimespanSelector
 {
   public:
-	ExportTimespanSelectorMultiple ();
+	ExportTimespanSelectorMultiple (ARDOUR::Session * session, ProfileManagerPtr manager);
 
   private:
 
@@ -138,13 +145,13 @@ class ExportTimespanSelectorMultiple : public ExportTimespanSelector
 class ExportTimespanSelectorSingle : public ExportTimespanSelector
 {
   public:
-	ExportTimespanSelectorSingle (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;
 
 };