notably modify the design and logic of the startup dialog, so that we can handle the requirements in the 3.0-SG branch reasonably. the two major changes concern the idea that we may need to run the audio setup tab at all times, and that the startup dialog could potentially be "ready" without actually needing to be displayed on-screen. this allows us to ALWAYS use a startup dialog, even if we don't actually need any information from the user. as usual with this kind of change, expect a few logic/workflow glitches

git-svn-id: svn://localhost/ardour2/branches/3.0@13397 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 3 deletions

diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h
index c2de96c55f..00c0a90d39 100644
--- a/gtk2_ardour/startup.h
+++ b/gtk2_ardour/startup.h
@@ -45,11 +45,10 @@ 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;
 
 	std::string session_name (bool& should_be_new);
 	std::string session_folder ();
@@ -83,7 +82,11 @@ 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;