Attempt to fix some confusions caused by bundles containing

[ardour.git] / gtk2_ardour / export_filename_selector.h

diff --git a/gtk2_ardour/export_filename_selector.h b/gtk2_ardour/export_filename_selector.h
index a6c36da83d31b0750927ac3a97dafcdf39a7454b..4db87d943bd5434b3ce0ed068aaaaa9cd082eb8c 100644 (file)
--- a/gtk2_ardour/export_filename_selector.h
+++ b/gtk2_ardour/export_filename_selector.h
@@ -25,13 +25,11 @@
 
 #include "ardour/export_profile_manager.h"
 #include "ardour/export_filename.h"
-
-namespace ARDOUR {
-       class Session;
-}
+#include "ardour/session_handle.h"
 
 ///
-class ExportFilenameSelector : public Gtk::VBox {
+class ExportFilenameSelector : public Gtk::VBox, public ARDOUR::SessionHandlePtr
+{
   public:
        typedef boost::shared_ptr<ARDOUR::ExportFilename> FilenamePtr;
 
@@ -60,7 +58,6 @@ class ExportFilenameSelector : public Gtk::VBox {
 
        void open_browse_dialog ();
 
-       ARDOUR::Session * session;
        boost::shared_ptr<ARDOUR::ExportFilename> filename;
 
        Glib::RefPtr<Gtk::SizeGroup> label_sizegroup;
@@ -91,7 +88,7 @@ class ExportFilenameSelector : public Gtk::VBox {
        {
          public:
                Gtk::TreeModelColumn<DateFormat>     format;
-               Gtk::TreeModelColumn<Glib::ustring>  label;
+               Gtk::TreeModelColumn<std::string>  label;
 
                DateFormatCols () { add(format); add(label); }
        };
@@ -107,7 +104,7 @@ class ExportFilenameSelector : public Gtk::VBox {
        {
          public:
                Gtk::TreeModelColumn<TimeFormat>     format;
-               Gtk::TreeModelColumn<Glib::ustring>  label;
+               Gtk::TreeModelColumn<std::string>  label;
 
                TimeFormatCols () { add(format); add(label); }
        };