Fix up confusion with relayering after movement drags in

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 95803785c10140ddb09840faf8f43e54d3d28de6..052a168a3775b453cb0abab863df5851d50b0657 100644 (file)
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -39,6 +39,8 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/combobox.h>
 
+#include "pbd/filesystem.h"
+
 #include "ardour/utils.h"
 
 class EngineControl;
@@ -51,11 +53,11 @@ class ArdourStartup : public Gtk::Assistant {
        void set_new_only (bool);
         void set_load_template( std::string load_template );
 
-       Glib::ustring session_name (bool& should_be_new);
-       Glib::ustring session_folder ();
+       std::string session_name (bool& should_be_new);
+       std::string session_folder ();
 
        bool use_session_template();
-       Glib::ustring session_template_name();
+       std::string session_template_name();
 
        EngineControl* engine_control() { return engine_dialog; }
 
@@ -75,7 +77,7 @@ class ArdourStartup : public Gtk::Assistant {
        bool connect_outs_to_master() const;
        bool connect_outs_to_physical() const;
 
-       gint response () const { 
+       gint response () const {
                return  _response;
        }
 
@@ -85,6 +87,8 @@ class ArdourStartup : public Gtk::Assistant {
        bool new_user;
        bool new_only;
 
+       PBD::sys::path been_here_before_path () const;
+
        void on_apply ();
        void on_cancel ();
        bool on_delete_event (GdkEventAny*);
@@ -153,8 +157,8 @@ class ArdourStartup : public Gtk::Assistant {
                    add (visible_name);
                    add (fullpath);
            }
-           Gtk::TreeModelColumn<Glib::ustring> visible_name;
-           Gtk::TreeModelColumn<Glib::ustring> fullpath;
+           Gtk::TreeModelColumn<std::string> visible_name;
+           Gtk::TreeModelColumn<std::string> fullpath;
        };
 
        RecentSessionModelColumns    recent_session_columns;
@@ -288,6 +292,7 @@ class ArdourStartup : public Gtk::Assistant {
        void move_along_now ();
 
        bool _existing_session_chooser_used; ///< set to true when the existing session chooser has been used
+        void setup_prerelease_page ();
 };
 
 #endif /* __gtk2_ardour_startup_h__ */