add AudioBackendNativeThread to serve the same role as jack_native_thread_t

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index e24e7d6989417e967faa93fad0a99e8b6ace5fb2..266a7e2a278c0d5146f287afc6fd75be02e26ec4 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -34,6 +34,7 @@
 #include "pbd/stacktrace.h"
 #include "pbd/openuri.h"
 
+#include "ardour/audioengine.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/session.h"
@@ -74,7 +75,6 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
        , monitor_via_hardware_button (string_compose (_("Use an external mixer or the hardware mixer of your audio interface.\n"
                                                         "%1 will play NO role in monitoring"), PROGRAM_NAME))
        , monitor_via_ardour_button (string_compose (_("Ask %1 to play back material as it is being recorded"), PROGRAM_NAME))
-       , engine_dialog (0)
        , new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER)
        , more_new_session_options_button (_("I'd like more options for this session"))
        , _output_limit_count_adj (1, 0, 100, 1, 10, 0)
@@ -91,13 +91,12 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
        , _existing_session_chooser_used (false)
 {
        new_user = !Glib::file_test (been_here_before_path(), Glib::FILE_TEST_EXISTS);
-       need_audio_setup = EngineControl::need_setup ();
        need_session_info = (session_name.empty() || require_new);
 
        _provided_session_name = session_name;
        _provided_session_path = session_path;
        
-       if (need_audio_setup || need_session_info || new_user) {
+       if (need_session_info || new_user) {
 
                use_template_button.set_group (session_template_group);
                use_session_as_template_button.set_group (session_template_group);
@@ -139,18 +138,10 @@ ArdourStartup::ArdourStartup (bool require_new, const std::string& session_name,
                        setup_monitoring_choice_page ();
                        setup_monitor_section_choice_page ();
                        
-                       if (need_audio_setup) {
-                               setup_audio_page ();
-                       }
-                       
                        ic_new_session_button.set_active (true); // always create new session on first run
                        
                } else {
                        
-                       if (need_audio_setup) {
-                               setup_audio_page ();
-                       }
-                       
                        setup_initial_choice_page ();
                }
 
@@ -183,7 +174,7 @@ ArdourStartup::~ArdourStartup ()
 bool
 ArdourStartup::ready_without_display () const
 {
-       return !new_user && !need_audio_setup && !need_session_info;
+       return !new_user && !need_session_info;
 }
 
 void
@@ -310,24 +301,6 @@ ArdourStartup::session_folder ()
        }
 }
 
-void
-ArdourStartup::setup_audio_page ()
-{
-       engine_dialog = manage (new EngineControl);
-
-       engine_dialog->set_border_width (12);
-
-       engine_dialog->show_all ();
-
-       audio_page_index = append_page (*engine_dialog);
-       set_page_type (*engine_dialog, ASSISTANT_PAGE_CONTENT);
-       set_page_title (*engine_dialog, _("Audio / MIDI Setup"));
-
-       /* the default parameters should work, so the page is potentially complete */
-
-       set_page_complete (*engine_dialog, true);
-}
-
 void
 ArdourStartup::setup_new_user_page ()
 {
@@ -403,8 +376,6 @@ Where would you like new %1 sessions to be stored by default?\n\n\
        vbox->pack_start (*txt, false, false);
        vbox->pack_start (*hbox, false, true);
 
-       cerr << "Setting defaultDIR session dir to [" << Config->get_default_session_parent_dir() << "]\n";
-
        default_dir_chooser->set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
        default_dir_chooser->signal_current_folder_changed().connect (sigc::mem_fun (*this, &ArdourStartup::default_dir_changed));
        default_dir_chooser->show ();
@@ -661,13 +632,6 @@ ArdourStartup::on_delete_event (GdkEventAny*)
 void
 ArdourStartup::on_apply ()
 {
-       if (engine_dialog) {
-               if (engine_dialog->setup_engine ()) {
-                        set_current_page (audio_page_index);
-                        return;
-                }
-       }
-
        if (config_modified) {
 
                if (default_dir_chooser) {