Fix reference of track after free() (#4795).

[ardour.git] / gtk2_ardour / startup.h

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 76183b5b5a6885bf054ff0d432e310c8f1740c94..19cb1b609d4693d4bac6ca7ad526c3744f714299 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;
@@ -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*);
@@ -111,9 +115,9 @@ class ArdourStartup : public Gtk::Assistant {
 
        void setup_initial_choice_page ();
        Gtk::VBox ic_vbox;
-       Gtk::RadioButton ic_new_session_button;
-       Gtk::RadioButton ic_existing_session_button;
+       Gtk::CheckButton ic_new_session_button;
        bool initial_button_press(GdkEventButton *);
+       void initial_button_clicked ();
        void initial_button_activated();
 
        /* monitoring choices */
@@ -132,15 +136,11 @@ class ArdourStartup : public Gtk::Assistant {
        Gtk::RadioButton no_monitor_section_button;
        void setup_monitor_section_choice_page ();
 
-       /* session page (could be new or existing) */
-
-       void setup_session_page ();
-       Gtk::VBox session_vbox;
-       Gtk::HBox session_hbox;
+       /* new session page */
 
-       /* recent sessions */
-
-       void setup_existing_session_page ();
+       void setup_new_session_page ();
+       Gtk::VBox new_session_vbox;
+       Gtk::HBox new_session_hbox;
 
        struct RecentSessionsSorter {
            bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
@@ -175,7 +175,6 @@ class ArdourStartup : public Gtk::Assistant {
 
        /* new sessions */
 
-       void setup_new_session_page ();
        Gtk::Entry new_name_entry;
        Gtk::FileChooserButton new_folder_chooser;
        Gtk::FileChooserButton session_template_chooser;
@@ -280,7 +279,7 @@ class ArdourStartup : public Gtk::Assistant {
        gint default_folder_page_index;
        gint monitoring_page_index;
        gint monitor_section_page_index;
-       gint session_page_index;
+       gint new_session_page_index;
        gint initial_choice_index;
        gint final_page_index;
        gint session_options_page_index;
@@ -288,7 +287,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_alpha_page ();
+        void setup_prerelease_page ();
 };
 
 #endif /* __gtk2_ardour_startup_h__ */