Fix ArdourHTTP error reporting

[ardour.git] / gtk2_ardour / export_format_selector.h

diff --git a/gtk2_ardour/export_format_selector.h b/gtk2_ardour/export_format_selector.h
index 6e1dd527869a2f34a05ea42cea26d37b01d44bf2..2b7d371d0423de54324af3e566d78725af016438 100644 (file)
--- a/gtk2_ardour/export_format_selector.h
+++ b/gtk2_ardour/export_format_selector.h
@@ -21,12 +21,17 @@
 #ifndef __export_format_selector_h__
 #define __export_format_selector_h__
 
-#include "ardour/export_profile_manager.h"
-
-#include <gtkmm.h>
+#include <string>
 #include <sigc++/signal.h>
 #include <boost/shared_ptr.hpp>
 
+#include <gtkmm/box.h>
+#include <gtkmm/button.h>
+#include <gtkmm/combobox.h>
+#include <gtkmm/liststore.h>
+#include <gtkmm/treemodel.h>
+
+#include "ardour/export_profile_manager.h"
 #include "ardour/session_handle.h"
 
 namespace ARDOUR {
@@ -34,16 +39,14 @@ namespace ARDOUR {
        class ExportProfileManager;
 }
 
-///
 class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 {
-
-  private:
+private:
 
        typedef boost::shared_ptr<ARDOUR::ExportFormatSpecification> FormatPtr;
        typedef std::list<FormatPtr> FormatList;
 
-  public:
+public:
 
        ExportFormatSelector ();
        ~ExportFormatSelector ();
@@ -59,11 +62,11 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
        sigc::signal<void> CriticalSelectionChanged;
 
-  private:
+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 ();
@@ -74,9 +77,9 @@ class ExportFormatSelector : public Gtk::HBox, public ARDOUR::SessionHandlePtr
 
        struct FormatCols : public Gtk::TreeModelColumnRecord
        {
-         public:
+       public:
                Gtk::TreeModelColumn<FormatPtr>      format;
-               Gtk::TreeModelColumn<Glib::ustring>  label;
+               Gtk::TreeModelColumn<std::string>  label;
 
                FormatCols () { add (format); add (label); }
        };