fix compilation
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 81a5b2c580e7a96f625b4979b2f0d89709006acc..43fd6bf11f97033b02ba41b9848d04fa64a367df 100644 (file)
@@ -109,6 +109,7 @@ typedef uint64_t microseconds_t;
 #include "rc_option_editor.h"
 #include "route_time_axis.h"
 #include "route_params_ui.h"
+#include "session_dialog.h"
 #include "session_metadata_dialog.h"
 #include "session_option_editor.h"
 #include "shuttle_control.h"
@@ -156,8 +157,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
          /* start of private members */
 
-       , _startup (0)
-       , engine (0)
        , nsm (0)
        , _was_dirty (false)
        , _mixer_on_top (false)
@@ -192,6 +191,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        , about (X_("about"), _("About"))
        , location_ui (X_("locations"), _("Locations"))
        , route_params (X_("inspector"), _("Tracks and Busses"))
+       , audio_midi_setup (X_("audio-midi-setup"), _("Audio/MIDI Setup"))
        , session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
        , add_video_dialog (X_("add-video"), _("Add Tracks/Busses"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
        , bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
@@ -203,7 +203,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        , _status_bar_visibility (X_("status-bar"))
        , _feedback_exists (false)
-
 {
        Gtkmm2ext::init(localedir);
 
@@ -215,11 +214,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        ui_config = new UIConfiguration();
 
+       ui_config->ParameterChanged.connect (sigc::mem_fun (*this, &ARDOUR_UI::parameter_changed));
+       boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
+       ui_config->map_parameters (pc);
+
        editor = 0;
        mixer = 0;
        meterbridge = 0;
        editor = 0;
-       engine = 0;
        _session_is_new = false;
        session_selector_window = 0;
        last_key_press_time = 0;
@@ -267,6 +269,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        ARDOUR::Session::AskAboutPendingState.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::pending_state_dialog, this));
 
+       /* handle Audio/MIDI setup when session requires it */
+
+       ARDOUR::Session::AudioEngineSetupRequired.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::do_audio_midi_setup, this, _1));
+
        /* handle sr mismatch with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
        ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
@@ -345,6 +351,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        WM::Manager::instance().register_window (&add_route_dialog);
        WM::Manager::instance().register_window (&add_video_dialog);
        WM::Manager::instance().register_window (&route_params);
+       WM::Manager::instance().register_window (&audio_midi_setup);
        WM::Manager::instance().register_window (&bundle_manager);
        WM::Manager::instance().register_window (&location_ui);
        WM::Manager::instance().register_window (&big_clock_window);
@@ -358,9 +365,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        
        (void) theme_manager.get (true);
        
-       starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup));
-       stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown));
-
        _process_thread = new ProcessThread ();
        _process_thread->init ();
 
@@ -381,35 +385,16 @@ ARDOUR_UI::create_global_port_matrix (ARDOUR::DataType type)
 void
 ARDOUR_UI::attach_to_engine ()
 {
-       engine = AudioEngine::instance();
-
-       engine->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
-       engine->Running.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
-       engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
-
-       engine->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
-
+       AudioEngine::instance()->Running.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
        ARDOUR::Port::set_connecting_blocked (ARDOUR_COMMAND_LINE::no_connect_ports);
-
-       /* if there is only one audio/midi backend, and it does not require setup, get our use of it underway
-        * right here (we need to know the client name and potential session ID
-        * to do this, which is why this is here, rather than in, say,
-        * ARDOUR::init().
-        */
-
-       if (!AudioEngine::instance()->setup_required()) {
-               const AudioBackendInfo* backend = AudioEngine::instance()->available_backends().front();
-               AudioEngine::instance()->set_backend (backend->name, ARDOUR_COMMAND_LINE::backend_client_name, ARDOUR_COMMAND_LINE::backend_session_uuid);
-               AudioEngine::instance()->start ();
-       }
 }
 
 void
 ARDOUR_UI::engine_stopped ()
 {
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_stopped)
-       ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
-       ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
+       ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, true);
 }
 
 void
@@ -418,58 +403,12 @@ ARDOUR_UI::engine_running ()
        if (first_time_engine_run) {
                post_engine();
                first_time_engine_run = false;
-       }
+       } 
        
-       ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true);
-       ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);
-
-       Glib::RefPtr<Action> action;
-       const char* action_name = 0;
-
-       switch (engine->samples_per_cycle()) {
-       case 32:
-               action_name = X_("JACKLatency32");
-               break;
-       case 64:
-               action_name = X_("JACKLatency64");
-               break;
-       case 128:
-               action_name = X_("JACKLatency128");
-               break;
-       case 512:
-               action_name = X_("JACKLatency512");
-               break;
-       case 1024:
-               action_name = X_("JACKLatency1024");
-               break;
-       case 2048:
-               action_name = X_("JACKLatency2048");
-               break;
-       case 4096:
-               action_name = X_("JACKLatency4096");
-               break;
-       case 8192:
-               action_name = X_("JACKLatency8192");
-               break;
-       default:
-               /* XXX can we do anything useful ? */
-               break;
-       }
-
-       if (action_name) {
-
-               action = ActionManager::get_action (X_("JACK"), action_name);
-
-               if (action) {
-                       Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action);
-                       ract->set_active ();
-               }
-
-               update_disk_space ();
-               update_cpu_load ();
-               update_sample_rate (engine->sample_rate());
-               update_timecode_format ();
-       }
+       update_disk_space ();
+       update_cpu_load ();
+       update_sample_rate (AudioEngine::instance()->sample_rate());
+       update_timecode_format ();
 }
 
 void
@@ -485,8 +424,8 @@ ARDOUR_UI::engine_halted (const char* reason, bool free_reason)
                return;
        }
 
-       ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
-       ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
+       ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, false);
+       ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, true);
 
        update_sample_rate (0);
 
@@ -497,13 +436,13 @@ ARDOUR_UI::engine_halted (const char* reason, bool free_reason)
        */
 
        if (strlen (reason)) {
-               msgstr = string_compose (_("The audio backend (JACK) was shutdown because:\n\n%1"), reason);
+               msgstr = string_compose (_("The audio backend was shutdown because:\n\n%1"), reason);
        } else {
                msgstr = string_compose (_("\
-JACK has either been shutdown or it\n\
+The audio backend has either been shutdown or it\n\
 disconnected %1 because %1\n\
 was not fast enough. Try to restart\n\
-JACK, reconnect and save the session."), PROGRAM_NAME);
+the audio backend and save the session."), PROGRAM_NAME);
        }
 
        MessageDialog msg (*editor, msgstr);
@@ -523,6 +462,12 @@ ARDOUR_UI::post_engine ()
         */
 
        ARDOUR::init_post_engine ();
+       
+       /* connect to important signals */
+
+       AudioEngine::instance()->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
+       AudioEngine::instance()->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
+       AudioEngine::instance()->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
 
        _tooltips.enable();
 
@@ -592,6 +537,10 @@ ARDOUR_UI::post_engine ()
 
 ARDOUR_UI::~ARDOUR_UI ()
 {
+       if (ui_config->dirty()) {
+               ui_config->save_state();
+       }
+
        delete keyboard;
        delete editor;
        delete mixer;
@@ -768,11 +717,12 @@ ARDOUR_UI::check_announcements ()
 #endif
 }
 
-void
-ARDOUR_UI::startup ()
+int
+ARDOUR_UI::starting ()
 {
        Application* app = Application::instance ();
        char *nsm_url;
+       bool brand_new_user = ArdourStartup::required ();
 
        app->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
        app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
@@ -831,10 +781,39 @@ ARDOUR_UI::startup ()
                        delete nsm;
                        nsm = 0;
                }
-       }
 
-       else if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session, ARDOUR_COMMAND_LINE::load_template)) {
-               exit (1);
+       } else  {
+               
+               if (brand_new_user) {
+                       ArdourStartup s;
+                       s.present ();
+                       main().run();
+                       s.hide ();
+                       switch (s.response ()) {
+                       case Gtk::RESPONSE_OK:
+                               break;
+                       default:
+                               return -1;
+                       }
+               }
+
+               /* we need to create this early because it may need to set the
+                *  audio backend end up.
+                */
+
+               try {
+                       audio_midi_setup.get (true);
+               } catch (...) {
+                       return -1;
+               }
+
+               /* go get a session */
+
+               const bool new_session_required = (ARDOUR_COMMAND_LINE::new_session || brand_new_user);
+
+               if (get_session_parameters (false, new_session_required, ARDOUR_COMMAND_LINE::load_template)) {
+                       return -1;
+               }
        }
 
        use_config ();
@@ -849,6 +828,7 @@ ARDOUR_UI::startup ()
        _status_bar_visibility.update ();
 
        BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
+       return 0;
 }
 
 void
@@ -868,7 +848,7 @@ ARDOUR_UI::check_memory_locking ()
 
        XMLNode* memory_warning_node = Config->instant_xml (X_("no-memory-warning"));
 
-       if (engine->is_realtime() && memory_warning_node == 0) {
+       if (AudioEngine::instance()->is_realtime() && memory_warning_node == 0) {
 
                struct rlimit limits;
                int64_t ram;
@@ -1009,7 +989,7 @@ If you still wish to quit, please use the\n\n\
        }
 
        halt_connection.disconnect ();
-       engine->stop ();
+       AudioEngine::instance()->stop ();
        quit ();
 }
 
@@ -1138,13 +1118,13 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
 
        ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_sample_rate, ignored)
 
-       if (!engine->connected()) {
+       if (!AudioEngine::instance()->connected()) {
 
                snprintf (buf, sizeof (buf), _("Audio: <span foreground=\"red\">none</span>"));
 
        } else {
 
-               framecnt_t rate = engine->sample_rate();
+               framecnt_t rate = AudioEngine::instance()->sample_rate();
 
                if (rate == 0) {
                        /* no sample rate available */
@@ -1154,15 +1134,14 @@ ARDOUR_UI::update_sample_rate (framecnt_t)
                        if (fmod (rate, 1000.0) != 0.0) {
                                snprintf (buf, sizeof (buf), _("Audio: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"),
                                          (float) rate / 1000.0f,
-                                         (engine->usecs_per_cycle() / 1000.0f));
+                                         (AudioEngine::instance()->usecs_per_cycle() / 1000.0f));
                        } else {
                                snprintf (buf, sizeof (buf), _("Audio: <span foreground=\"green\">%" PRId64 " kHz / %4.1f ms</span>"),
                                          rate/1000,
-                                         (engine->usecs_per_cycle() / 1000.0f));
+                                         (AudioEngine::instance()->usecs_per_cycle() / 1000.0f));
                        }
                }
        }
-
        sample_rate_label.set_markup (buf);
 }
 
@@ -1229,7 +1208,7 @@ ARDOUR_UI::update_cpu_load ()
           should also be changed.
        */
 
-       float const c = engine->get_cpu_load ();
+       float const c = AudioEngine::instance()->get_cpu_load ();
        snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
        cpu_load_label.set_markup (buf);
 }
@@ -1550,20 +1529,16 @@ ARDOUR_UI::open_recent_session ()
 bool
 ARDOUR_UI::check_audioengine ()
 {
-       if (engine) {
-               if (!engine->connected()) {
-                       MessageDialog msg (string_compose (
-                                                  _("%1 is not connected to JACK\n"
-                                                    "You cannot open or close sessions in this condition"),
-                                                  PROGRAM_NAME));
-                       pop_back_splash (msg);
-                       msg.run ();
-                       return false;
-               }
-               return true;
-       } else {
+       if (!AudioEngine::instance()->connected()) {
+               MessageDialog msg (string_compose (
+                                          _("%1 is not connected to any audio backend.\n"
+                                            "You cannot open or close sessions in this condition"),
+                                          PROGRAM_NAME));
+               pop_back_splash (msg);
+               msg.run ();
                return false;
        }
+       return true;
 }
 
 void
@@ -1870,7 +1845,7 @@ ARDOUR_UI::transport_roll ()
 #if 0
        if (_session->config.get_external_sync()) {
                switch (Config->get_sync_source()) {
-               case JACK:
+               case Engine:
                        break;
                default:
                        /* transport controlled by the master */
@@ -1920,7 +1895,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 
        if (_session->config.get_external_sync()) {
                switch (Config->get_sync_source()) {
-               case JACK:
+               case Engine:
                        break;
                default:
                        /* transport controlled by the master */
@@ -2492,7 +2467,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
 }
 
 int
-ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::string& session_name)
+ARDOUR_UI::build_session_from_dialog (SessionDialog& sd, const std::string& session_path, const std::string& session_name)
 {
        BusProfile bus_profile;
 
@@ -2508,13 +2483,13 @@ ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::s
 
                /* get settings from advanced section of NSD */
 
-               if (_startup->create_master_bus()) {
-                       bus_profile.master_out_channels = (uint32_t) _startup->master_channel_count();
+               if (sd.create_master_bus()) {
+                       bus_profile.master_out_channels = (uint32_t) sd.master_channel_count();
                } else {
                        bus_profile.master_out_channels = 0;
                }
 
-               if (_startup->connect_inputs()) {
+               if (sd.connect_inputs()) {
                        bus_profile.input_ac = AutoConnectPhysical;
                } else {
                        bus_profile.input_ac = AutoConnectOption (0);
@@ -2522,16 +2497,16 @@ ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::s
 
                bus_profile.output_ac = AutoConnectOption (0);
 
-               if (_startup->connect_outputs ()) {
-                       if (_startup->connect_outs_to_master()) {
+               if (sd.connect_outputs ()) {
+                       if (sd.connect_outs_to_master()) {
                                bus_profile.output_ac = AutoConnectMaster;
-                       } else if (_startup->connect_outs_to_physical()) {
+                       } else if (sd.connect_outs_to_physical()) {
                                bus_profile.output_ac = AutoConnectPhysical;
                        }
                }
 
-               bus_profile.requested_physical_in = (uint32_t) _startup->input_limit_count();
-               bus_profile.requested_physical_out = (uint32_t) _startup->output_limit_count();
+               bus_profile.requested_physical_in = (uint32_t) sd.input_limit_count();
+               bus_profile.requested_physical_out = (uint32_t) sd.output_limit_count();
        }
 
        if (build_session (session_path, session_name, bus_profile)) {
@@ -2567,6 +2542,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
        string template_name;
        int ret = -1;
        bool likely_new = false;
+       bool cancel_not_quit;
 
        /* deal with any existing DIRTY session now, rather than later. don't
         * treat a non-dirty session this way, so that it stays visible 
@@ -2577,6 +2553,11 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                ARDOUR_UI::instance()->video_timeline->sync_session_state();
        }
 
+       /* if there is already a session, relabel the button
+          on the SessionDialog so that we don't Quit directly
+       */
+       cancel_not_quit = (_session != 0);
+
        if (_session && _session->dirty()) {
                if (unload_session (false)) {
                        /* unload cancelled by user */
@@ -2590,6 +2571,20 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                template_name = load_template;
        }
 
+       session_name = basename_nosuffix (ARDOUR_COMMAND_LINE::session_name);
+       session_path = ARDOUR_COMMAND_LINE::session_name;
+       
+       if (!session_path.empty()) {
+               if (Glib::file_test (session_path.c_str(), Glib::FILE_TEST_EXISTS)) {
+                       if (Glib::file_test (session_path.c_str(), Glib::FILE_TEST_IS_REGULAR)) {
+                               /* session/snapshot file, change path to be dir */
+                               session_path = Glib::path_get_dirname (session_path);
+                       }
+               }
+       }
+
+       SessionDialog session_dialog (should_be_new, session_name, session_path, load_template, cancel_not_quit);
+
        while (ret != 0) {
 
                if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
@@ -2612,34 +2607,35 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                } else {
                        session_path = "";
                        session_name = "";
-               }
-
-               delete _startup;
-               _startup = new ArdourStartup (should_be_new, session_name, session_path, load_template);
-               
-               if (!_startup->ready_without_display()) {
-                       _startup->present ();
-                       main().run();
-                       _startup->hide ();
+                       session_dialog.clear_given ();
                }
                
-               switch (_startup->response()) {
-               case RESPONSE_OK:
-                       break;
-               default:
-                       if (quit_on_cancel) {
-                               exit (1);
-                       } else {
-                               return ret;
+               if (should_be_new || session_name.empty()) {
+                       /* need the dialog to get info from user */
+
+                       cerr << "run dialog\n";
+
+                       switch (session_dialog.run()) {
+                       case RESPONSE_ACCEPT:
+                               break;
+                       default:
+                               if (quit_on_cancel) {
+                                       exit (1);
+                               } else {
+                                       return ret;
+                               }
                        }
+
+                       session_dialog.hide ();
                }
 
                /* if we run the startup dialog again, offer more than just "new session" */
                
                should_be_new = false;
                
-               session_name = _startup->session_name (likely_new);
-               
+               session_name = session_dialog.session_name (likely_new);
+               session_path = session_dialog.session_folder ();
+
                if (nsm) {
                        likely_new = true;
                }
@@ -2656,8 +2652,8 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                        continue;
                }
                
-               if (_startup->use_session_template()) {
-                       template_name = _startup->session_template_name();
+               if (session_dialog.use_session_template()) {
+                       template_name = session_dialog.session_template_name();
                        _session_is_new = true;
                }
                
@@ -2674,12 +2670,12 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                        
                } else {
 
-                       session_path = _startup->session_folder();
+                       session_path = session_dialog.session_folder();
                        
                        char illegal = Session::session_name_is_legal (session_name);
                        
                        if (illegal) {
-                               MessageDialog msg (*_startup,
+                               MessageDialog msg (session_dialog,
                                                   string_compose (_("To ensure compatibility with various systems\n"
                                                                     "session names may not contain a '%1' character"),
                                                                   illegal));
@@ -2691,6 +2687,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
        
                if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
+
                        if (likely_new && !nsm) {
 
                                std::string existing = Glib::build_filename (session_path, session_name);
@@ -2706,12 +2703,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                } else {
 
                        if (!likely_new) {
-                               if (_startup) {
-                                       pop_back_splash (*_startup);
-                               } else {
-                                       hide_splash ();
-                               }
-
+                               pop_back_splash (session_dialog);
                                MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
@@ -2719,10 +2711,11 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                        }
 
                        char illegal = Session::session_name_is_legal(session_name);
+
                        if (illegal) {
-                               pop_back_splash (*_startup);
-                               MessageDialog msg (*_startup, string_compose(_("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '%1' character"), illegal));
+                               pop_back_splash (session_dialog);
+                               MessageDialog msg (session_dialog, string_compose(_("To ensure compatibility with various systems\n"
+                                                                                   "session names may not contain a '%1' character"), illegal));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
@@ -2733,7 +2726,7 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
                if (likely_new && template_name.empty()) {
 
-                       ret = build_session_from_nsd (session_path, session_name);
+                       ret = build_session_from_dialog (session_dialog, session_path, session_name);
 
                } else {
 
@@ -2748,6 +2741,12 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                                _session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
                                exit (1);
                        }
+
+                       /* clear this to avoid endless attempts to load the
+                          same session.
+                       */
+
+                       ARDOUR_COMMAND_LINE::session_name = "";
                }
        }
 
@@ -2784,25 +2783,23 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
        int unload_status;
        int retval = -1;
 
-       session_loaded = false;
-
-       if (!check_audioengine()) {
-               return -2;
+       if (_session) {
+               unload_status = unload_session ();
+               
+               if (unload_status < 0) {
+                       goto out;
+               } else if (unload_status > 0) {
+                       retval = 0;
+                       goto out;
+               }
        }
 
-       unload_status = unload_session ();
-
-       if (unload_status < 0) {
-               goto out;
-       } else if (unload_status > 0) {
-               retval = 0;
-               goto out;
-       }
+       session_loaded = false;
 
        loading_message (string_compose (_("Please wait while %1 loads your session"), PROGRAM_NAME));
 
        try {
-               new_session = new Session (*engine, path, snap_name, 0, mix_template);
+               new_session = new Session (*AudioEngine::instance(), path, snap_name, 0, mix_template);
        }
 
        /* this one is special */
@@ -2842,22 +2839,12 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                                   Gtk::MESSAGE_INFO,
                                   BUTTONS_OK);
 
+               msg.set_keep_above (true);
                msg.set_title (_("Loading Error"));
-               msg.set_secondary_text (_("Click the Refresh button to try again."));
-               msg.add_button (Stock::REFRESH, 1);
                msg.set_position (Gtk::WIN_POS_CENTER);
                pop_back_splash (msg);
                msg.present ();
-
-               int response = msg.run ();
-
-               switch (response) {
-               case 1:
-                       break;
-               default:
-                       exit (1);
-               }
-
+               (void) msg.run ();
                msg.hide ();
 
                goto out;
@@ -2871,6 +2858,22 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                }
        }
 
+       if (!new_session->writable()) {
+               MessageDialog msg (_("This session has been opened in read-only mode.\n\nYou will not be able to record or save."),
+                                  true,
+                                  Gtk::MESSAGE_INFO,
+                                  BUTTONS_OK);
+               
+               msg.set_keep_above (true);
+               msg.set_title (_("Read-only Session"));
+               msg.set_position (Gtk::WIN_POS_CENTER);
+               pop_back_splash (msg);
+               msg.present ();
+               (void) msg.run ();
+               msg.hide ();
+       }
+       
+
        /* Now the session been created, add the transport controls */
        new_session->add_controllable(roll_controllable);
        new_session->add_controllable(stop_controllable);
@@ -2903,12 +2906,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
        Session *new_session;
        int x;
 
-       if (!check_audioengine()) {
-               return -1;
-       }
-
        session_loaded = false;
-
        x = unload_session ();
 
        if (x < 0) {
@@ -2920,7 +2918,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
        _session_is_new = true;
 
        try {
-               new_session = new Session (*engine, path, snap_name, &bus_profile);
+               new_session = new Session (*AudioEngine::instance(), path, snap_name, &bus_profile);
        }
 
        catch (...) {
@@ -3807,38 +3805,43 @@ audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual
         return 1;
 }
 
-
-void
-ARDOUR_UI::disconnect_from_jack ()
+int
+ARDOUR_UI::disconnect_from_engine ()
 {
-       if (engine) {
-               /* drop connection to AudioEngine::Halted so that we don't act
-                *  as if the engine unexpectedly shut down
-                */
-               halt_connection.disconnect ();
-
-               if (engine->stop ()) {
-                       MessageDialog msg (*editor, _("Could not disconnect from JACK"));
-                       msg.run ();
-               } else {
-                       engine->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
-               }
+       /* drop connection to AudioEngine::Halted so that we don't act
+        *  as if the engine unexpectedly shut down
+        */
 
-               update_sample_rate (0);
+       halt_connection.disconnect ();
+       
+       if (AudioEngine::instance()->stop ()) {
+               MessageDialog msg (*editor, _("Could not disconnect from Audio/MIDI engine"));
+               msg.run ();
+               return -1;
+       } else {
+               AudioEngine::instance()->Halted.connect_same_thread (halt_connection, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
        }
+       
+       update_sample_rate (0);
+       return 0;
 }
 
-void
-ARDOUR_UI::reconnect_to_jack ()
+int
+ARDOUR_UI::reconnect_to_engine ()
 {
-       if (engine) {
-               if (engine->start ()) {
-                       MessageDialog msg (*editor,  _("Could not reconnect to JACK"));
+       if (AudioEngine::instance()->start ()) {
+               if (editor) {
+                       MessageDialog msg (*editor,  _("Could not reconnect to the Audio/MIDI engine"));
+                       msg.run ();
+               } else {
+                       MessageDialog msg (_("Could not reconnect to the Audio/MIDI engine"));
                        msg.run ();
                }
-
-               update_sample_rate (0);
+               return -1;
        }
+       
+       update_sample_rate (0);
+       return 0;
 }
 
 void
@@ -4145,3 +4148,21 @@ ARDOUR_UI::reset_route_peak_display (Route* route)
                reset_peak_display ();
        }
 }
+
+int
+ARDOUR_UI::do_audio_midi_setup (uint32_t desired_sample_rate)
+{
+       audio_midi_setup->set_desired_sample_rate (desired_sample_rate);
+       audio_midi_setup->set_position (WIN_POS_CENTER);
+
+       switch (audio_midi_setup->run()) {
+       case Gtk::RESPONSE_OK:
+               return 0;
+       case Gtk::RESPONSE_APPLY:
+               return 0;
+       default:
+               return -1;
+       }
+}
+
+