X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fexport_format_selector.h;h=9533b15d9b3163fa633848ace5993d0f8c2ac2e2;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=78daf5b5c6e3ebef4063abb37fe8cad00736beb8;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index 78daf5b5c6..9533b15d9b 100644
--- a/gtk2_ardour/export_format_selector.h
+++ b/gtk2_ardour/export_format_selector.h
@@ -21,20 +21,22 @@
 #ifndef __export_format_selector_h__
 #define __export_format_selector_h__
 
-#include "ardour/export_profile_manager.h"
-
+#include <string>
 #include <gtkmm.h>
 #include <sigc++/signal.h>
 #include <boost/shared_ptr.hpp>
 
+#include "ardour/export_profile_manager.h"
+#include "ardour/session_handle.h"
+
 namespace ARDOUR {
-	class Session;
 	class ExportFormatSpecification;
 	class ExportProfileManager;
 }
 
-/// 
-class ExportFormatSelector : public Gtk::HBox {
+///
+class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
+{
 
   private:
 
@@ -45,16 +47,16 @@ class ExportFormatSelector : public Gtk::HBox {
 
 	ExportFormatSelector ();
 	~ExportFormatSelector ();
-	
+
 	void set_state (ARDOUR::ExportProfileManager::FormatStatePtr state_, ARDOUR::Session * session_);
 	void update_format_list ();
-	
+
 	sigc::signal<void, FormatPtr> FormatEdited;
 	sigc::signal<void, FormatPtr> FormatRemoved;
 	sigc::signal<FormatPtr, FormatPtr> NewFormat;
-	
+
 	/* Compatibility with other elements */
-	
+
 	sigc::signal<void> CriticalSelectionChanged;
 
   private:
@@ -67,7 +69,6 @@ class ExportFormatSelector : public Gtk::HBox {
 	void update_format_description ();
 
 	ARDOUR::ExportProfileManager::FormatStatePtr state;
-	ARDOUR::Session * session;
 
 	/*** GUI componenets ***/
 
@@ -75,8 +76,8 @@ class ExportFormatSelector : public Gtk::HBox {
 	{
 	  public:
 		Gtk::TreeModelColumn<FormatPtr>      format;
-		Gtk::TreeModelColumn<Glib::ustring>  label;
-	
+		Gtk::TreeModelColumn<std::string>  label;
+
 		FormatCols () { add (format); add (label); }
 	};
 	FormatCols                   format_cols;