X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_format_selector.h;h=4af647ac9c8e8355f57b29df142e0778a5465ba9;hb=50b25571bc8680be22089fa12d9c9676d71e1331;hp=d4e4ae01105ec9e6d91b6afabd73b974ba66f894;hpb=b5a57cc78c92b1d887b7e8de040d8663a9ba187e;p=ardour.git

diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index d4e4ae0110..4af647ac9c 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,29 +47,28 @@ 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:
 
 	void select_format (FormatPtr f);
 	void add_new_format ();
-	void remove_format ();
+	void remove_format (bool called_from_button = false);
 	int open_edit_dialog (bool new_dialog = false);
 	void update_format_combo ();
 	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;