X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstartup.h;h=00c0a90d39de7f1a280f09a8382fc42ada9794a4;hb=38c10a4d2367111f3b9c7ac2223a8b633bfeb147;hp=397b7314e65c446d87f6200dccca06837705a9c8;hpb=035de2a367acd7ee27c3dbfba2f6c71f3c137eb8;p=ardour.git

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index 397b7314e6..00c0a90d39 100644
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -45,17 +45,16 @@ class EngineControl;
 
 class ArdourStartup : public Gtk::Assistant {
   public:
-	ArdourStartup ();
+        ArdourStartup (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name);
 	~ArdourStartup ();
 
-	void set_new_only (bool);
-        void set_load_template( std::string load_template );
+        bool ready_without_display () const;
 
-	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 +74,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;
 	}
 
@@ -83,7 +82,13 @@ class ArdourStartup : public Gtk::Assistant {
 	gint _response;
 	bool config_modified;
 	bool new_user;
+        bool need_audio_setup;
+        bool need_session_info;
 	bool new_only;
+        std::string _provided_session_name;
+        std::string _provided_session_path;
+
+	std::string been_here_before_path () const;
 
 	void on_apply ();
 	void on_cancel ();
@@ -113,7 +118,7 @@ class ArdourStartup : public Gtk::Assistant {
 	Gtk::VBox ic_vbox;
 	Gtk::RadioButton ic_new_session_button;
 	Gtk::RadioButton ic_existing_session_button;
-	bool initial_button_press(GdkEventButton *);
+        bool initial_button_clicked(GdkEventButton*);
 	void initial_button_activated();
 
 	/* monitoring choices */
@@ -141,8 +146,6 @@ class ArdourStartup : public Gtk::Assistant {
 	/* recent sessions */
 
 	void setup_existing_session_page ();
-	/** true when setup_existing_session_page () has already been called at least once */
-	bool _have_setup_existing_session_page;
 
 	struct RecentSessionsSorter {
 	    bool operator() (std::pair<std::string,std::string> a, std::pair<std::string,std::string> b) const {
@@ -155,8 +158,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;
@@ -198,6 +201,7 @@ class ArdourStartup : public Gtk::Assistant {
 	Gtk::ComboBox template_chooser;
 
 	Gtk::VBox session_new_vbox;
+	Gtk::VBox session_existing_vbox;
 	Gtk::CheckButton more_new_session_options_button;
 	Gtk::RadioButtonGroup session_template_group;
 	Gtk::RadioButton use_session_as_template_button;
@@ -289,6 +293,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__ */