Remove use of invalidated iterator (#4826).
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 0ebf07afe502b3bfa56f7a54fae48ac139583464..d9142b8b1aa6eb9c182717a8383087a35a4573a6 100644 (file)
@@ -62,6 +62,7 @@
 #include "ardour/ardour.h"
 #include "ardour/callback.h"
 #include "ardour/profile.h"
+#include "ardour/plugin_manager.h"
 #include "ardour/session_directory.h"
 #include "ardour/session_route.h"
 #include "ardour/session_state_utils.h"
@@ -136,12 +137,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
 
        , gui_object_state (new GUIObjectState)
-       , primary_clock (new AudioClock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true))
-       , secondary_clock (new AudioClock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true))
+       , primary_clock (new AudioClock (X_("primary"), false, X_("transport"), true, true, false, true))
+       , secondary_clock (new AudioClock (X_("secondary"), false, X_("secondary"), true, true, false, true))
 
          /* big clock */
 
-       , big_clock (new AudioClock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false))
+       , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
 
          /* transport */
 
@@ -157,12 +158,14 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        , auto_play_button (ArdourButton::led_default_elements)
        , auto_input_button (ArdourButton::led_default_elements)
 
-       , auditioning_alert_button (_("AUDITION"))
-       , solo_alert_button (_("SOLO"))
+       , auditioning_alert_button (_("audition"))
+       , solo_alert_button (_("solo"))
+       , feedback_alert_button (_("feedback"))
 
        , error_log_button (_("Errors"))
 
        , _status_bar_visibility (X_("status-bar"))
+       , _feedback_exists (false)
 
 {
        using namespace Gtk::Menu_Helpers;
@@ -202,7 +205,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        big_clock_resize_in_progress = false;
        session_selector_window = 0;
        last_key_press_time = 0;
-       _will_create_new_session_automatically = false;
        add_route_dialog = 0;
        route_params = 0;
        bundle_manager = 0;
@@ -218,6 +220,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        original_big_clock_height = -1;
        original_big_clock_font_size = 0;
 
+       roll_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
+       play_selection_button.set_elements (ArdourButton::Element (ArdourButton::Body|ArdourButton::Text));
+       
        roll_button.set_controllable (roll_controllable);
        stop_button.set_controllable (stop_controllable);
        goto_start_button.set_controllable (goto_start_controllable);
@@ -233,10 +238,11 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        auto_loop_button.set_name ("transport button");
        play_selection_button.set_name ("transport button");
        rec_button.set_name ("transport recenable button");
-       join_play_range_button.set_name ("transport button");
+       midi_panic_button.set_name ("transport button");
 
        goto_start_button.set_tweaks (ArdourButton::ShowClick);
        goto_end_button.set_tweaks (ArdourButton::ShowClick);
+       midi_panic_button.set_tweaks (ArdourButton::ShowClick);
        
        last_configure_time= 0;
        last_peak_grab = 0;
@@ -263,6 +269,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
        /* tell the user about feedback */
 
        ARDOUR::Session::FeedbackDetected.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::feedback_detected, this), gui_context ());
+       ARDOUR::Session::SuccessfulGraphSort.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::successful_graph_sort, this), gui_context ());
 
        /* handle requests to deal with missing files */
 
@@ -284,7 +291,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
                GainMeter::setup_slider_pix ();
                RouteTimeAxisView::setup_slider_pix ();
-               SendProcessorEntry::setup_slider_pix ();
+               ProcessorEntry::setup_slider_pix ();
                SessionEvent::create_per_thread_pool ("GUI", 512);
 
        } catch (failed_constructor& err) {
@@ -334,6 +341,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
        _process_thread = new ProcessThread ();
        _process_thread->init ();
+
+       DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
 }
 
 /** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
@@ -407,7 +416,10 @@ ARDOUR_UI::post_engine ()
 
        ARDOUR::init_post_engine ();
 
+       /* load up the UI manager */
+
        ActionManager::init ();
+
        _tooltips.enable();
 
        if (setup_windows ()) {
@@ -496,11 +508,10 @@ ARDOUR_UI::~ARDOUR_UI ()
 }
 
 void
-ARDOUR_UI::pop_back_splash ()
+ARDOUR_UI::pop_back_splash (Gtk::Window& win)
 {
        if (Splash::instance()) {
-               // Splash::instance()->pop_back();
-               Splash::instance()->hide ();
+               Splash::instance()->pop_back_for (win);
        }
 }
 
@@ -639,59 +650,6 @@ ARDOUR_UI::update_autosave ()
        }
 }
 
-void
-ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
-{
-       string title;
-       if (we_set_params) {
-               title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME);
-       } else {
-               title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME);
-       }
-
-       MessageDialog win (title,
-                          false,
-                          Gtk::MESSAGE_INFO,
-                          Gtk::BUTTONS_NONE);
-
-       if (we_set_params) {
-               win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) You requested audio parameters that are not supported..\n\
-2) JACK is running as another user.\n\
-\n\
-Please consider the possibilities, and perhaps try different parameters."));
-       } else {
-               win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) JACK is not running.\n\
-2) JACK is running as another user, perhaps root.\n\
-3) There is already another client called \"ardour\".\n\
-\n\
-Please consider the possibilities, and perhaps (re)start JACK."));
-       }
-
-       if (toplevel) {
-               win.set_transient_for (*toplevel);
-       }
-
-       if (we_set_params) {
-               win.add_button (Stock::OK, RESPONSE_CLOSE);
-       } else {
-               win.add_button (Stock::QUIT, RESPONSE_CLOSE);
-       }
-
-       win.set_default_response (RESPONSE_CLOSE);
-
-       win.show_all ();
-       win.set_position (Gtk::WIN_POS_CENTER);
-       pop_back_splash ();
-
-       /* we just don't care about the result, but we want to block */
-
-       win.run ();
-}
-
 void
 ARDOUR_UI::startup ()
 {
@@ -789,7 +747,7 @@ ARDOUR_UI::check_memory_locking ()
                                vbox->show();
                                hbox.show ();
 
-                               pop_back_splash ();
+                               pop_back_splash (msg);
 
                                editor->ensure_float (msg);
                                msg.run ();
@@ -842,7 +800,7 @@ ARDOUR_UI::finish()
 Ardour was unable to save your session.\n\n\
 If you still wish to quit, please use the\n\n\
 \"Just quit\" option."));
-                                       pop_back_splash();
+                                       pop_back_splash(msg);
                                        msg.run ();
                                        return;
                                }
@@ -1010,29 +968,29 @@ ARDOUR_UI::update_format ()
        }
 
        stringstream s;
-       s << "File: <span foreground=\"green\">";
+       s << _("File:") << X_(" <span foreground=\"green\">");
 
        switch (_session->config.get_native_file_header_format ()) {
        case BWF:
-               s << "BWF";
+               s << _("BWF");
                break;
        case WAVE:
-               s << "WAV";
+               s << _("WAV");
                break;
        case WAVE64:
-               s << "WAV64";
+               s << _("WAV64");
                break;
        case CAF:
-               s << "CAF";
+               s << _("CAF");
                break;
        case AIFF:
-               s << "AIFF";
+               s << _("AIFF");
                break;
        case iXML:
-               s << "iXML";
+               s << _("iXML");
                break;
        case RF64:
-               s << "RF64";
+               s << _("RF64");
                break;
        }
 
@@ -1040,17 +998,17 @@ ARDOUR_UI::update_format ()
        
        switch (_session->config.get_native_file_data_format ()) {
        case FormatFloat:
-               s << "32-float";
+               s << _("32-float");
                break;
        case FormatInt24:
-               s << "24-int";
+               s << _("24-int");
                break;
        case FormatInt16:
-               s << "16-int";
+               s << _("16-int");
                break;
        }
 
-       s << "</span>";
+       s << X_("</span>");
 
        format_label.set_markup (s.str ());
 }
@@ -1060,7 +1018,7 @@ ARDOUR_UI::update_cpu_load ()
 {
        char buf[64];
 
-       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::build_menu_bar
+       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::resize_text_widgets
           should also be changed.
        */
 
@@ -1077,7 +1035,7 @@ ARDOUR_UI::update_buffer_load ()
        uint32_t const playback = _session ? _session->playback_load () : 100;
        uint32_t const capture = _session ? _session->capture_load () : 100;
 
-       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::build_menu_bar
+       /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::resize_text_widgets
           should also be changed.
        */
        
@@ -1181,13 +1139,6 @@ ARDOUR_UI::update_wall_clock ()
        return TRUE;
 }
 
-gint
-ARDOUR_UI::session_menu (GdkEventButton */*ev*/)
-{
-       session_popup_menu->popup (0, 0);
-       return TRUE;
-}
-
 void
 ARDOUR_UI::redisplay_recent_sessions ()
 {
@@ -1268,6 +1219,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
                }
        }
 
+       recent_session_display.set_tooltip_column(1); // recent_session_columns.fullpath
        recent_session_display.set_model (recent_session_model);
 }
 
@@ -1369,7 +1321,7 @@ ARDOUR_UI::check_audioengine ()
                                                   _("%1 is not connected to JACK\n"
                                                     "You cannot open or close sessions in this condition"),
                                                   PROGRAM_NAME));
-                       pop_back_splash ();
+                       pop_back_splash (msg);
                        msg.run ();
                        return false;
                }
@@ -1397,6 +1349,17 @@ ARDOUR_UI::open_session ()
                open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
                open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
                open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
+               
+               if (_session) {
+                       string session_parent_dir = Glib::path_get_dirname(_session->path());
+                       string::size_type last_dir_sep = session_parent_dir.rfind(G_DIR_SEPARATOR);
+                       session_parent_dir = session_parent_dir.substr(0, last_dir_sep);
+                       open_session_selector->set_current_folder(session_parent_dir);
+               } else {
+                       open_session_selector->set_current_folder(Config->get_default_session_parent_dir());
+               }
+
+               open_session_selector->add_shortcut_folder (Config->get_default_session_parent_dir());
 
                FileFilter session_filter;
                session_filter.add_pattern ("*.ardour");
@@ -1431,7 +1394,7 @@ ARDOUR_UI::open_session ()
 
 
 void
-ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, string const & name_template)
+ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
 
@@ -1443,7 +1406,7 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
        try {
                if (disk) {
 
-                       tracks = _session->new_midi_track (ARDOUR::Normal, route_group, how_many, name_template);
+                       tracks = _session->new_midi_track (instrument, ARDOUR::Normal, route_group, how_many, name_template);
 
                        if (tracks.size() != how_many) {
                                if (how_many == 1) {
@@ -1452,6 +1415,7 @@ ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t
                                        error << string_compose (_("could not create %1 new midi tracks"), how_many) << endmsg;
                                }
                        }
+                       
                } /*else {
                        if ((route = _session->new_midi_route ()) == 0) {
                                error << _("could not create new midi bus") << endmsg;
@@ -1522,30 +1486,11 @@ ARDOUR_UI::session_add_audio_route (
 to create a new track or bus.\n\
 You should save %1, exit and\n\
 restart JACK with more ports."), PROGRAM_NAME));
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.run ();
        }
 }
 
-void
-ARDOUR_UI::do_transport_locate (framepos_t new_position, bool with_roll)
-{
-       framecnt_t _preroll = 0;
-
-       if (_session) {
-               // XXX CONFIG_CHANGE FIX - requires AnyTime handling
-               // _preroll = _session->convert_to_frames_at (new_position, Config->get_preroll());
-
-               if (new_position > _preroll) {
-                       new_position -= _preroll;
-               } else {
-                       new_position = 0;
-               }
-
-               _session->request_locate (new_position, with_roll);
-       }
-}
-
 void
 ARDOUR_UI::transport_goto_start ()
 {
@@ -1638,22 +1583,6 @@ ARDOUR_UI::transport_stop ()
        _session->request_stop (false, true);
 }
 
-void
-ARDOUR_UI::transport_stop_and_forget_capture ()
-{
-       if (_session) {
-               _session->request_stop (true, true);
-       }
-}
-
-void
-ARDOUR_UI::remove_last_capture()
-{
-       if (editor) {
-               editor->remove_last_capture();
-       }
-}
-
 void
 ARDOUR_UI::transport_record (bool roll)
 {
@@ -1662,7 +1591,7 @@ ARDOUR_UI::transport_record (bool roll)
                switch (_session->record_status()) {
                case Session::Disabled:
                        if (_session->ntracks() == 0) {
-                               MessageDialog msg (*editor, _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu."));
+                               MessageDialog msg (*editor, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
                                msg.run ();
                                return;
                        }
@@ -1718,12 +1647,12 @@ ARDOUR_UI::transport_roll ()
                if (!Config->get_seamless_loop()) {
                        _session->request_play_loop (false, true);
                }
-       } else if (_session->get_play_range () && !join_play_range_button.active_state()) {
+       } else if (_session->get_play_range () && !Config->get_always_play_range()) {
                /* stop playing a range if we currently are */
                _session->request_play_range (0, true);
        }
 
-       if (join_play_range_button.active_state()) {
+       if (Config->get_always_play_range()) {
                _session->request_play_range (&editor->get_selection().time, true);
        }
 
@@ -1782,7 +1711,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
                if (rolling) {
                        _session->request_stop (with_abort, true);
                } else {
-                       if (join_play_range_button.active_state()) {
+                       if (Config->get_always_play_range ()) {
                                _session->request_play_range (&editor->get_selection().time, true);
                        }
 
@@ -1794,7 +1723,9 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
 void
 ARDOUR_UI::toggle_session_auto_loop ()
 {
-       if (!_session) {
+       Location * looploc = _session->locations()->auto_loop_location();
+
+       if (!_session || !looploc) {
                return;
        }
 
@@ -1802,24 +1733,18 @@ ARDOUR_UI::toggle_session_auto_loop ()
 
                if (_session->transport_rolling()) {
 
-                       Location * looploc = _session->locations()->auto_loop_location();
-
-                       if (looploc) {
-                               _session->request_locate (looploc->start(), true);
-                               _session->request_play_loop (false);
-                       }
+                       _session->request_locate (looploc->start(), true);
+                       _session->request_play_loop (false);
 
                } else {
                        _session->request_play_loop (false);
                }
        } else {
-
-         Location * looploc = _session->locations()->auto_loop_location();
-
-               if (looploc) {
-                       _session->request_play_loop (true);
-               }
+               _session->request_play_loop (true);
        }
+       
+       //show the loop markers
+       looploc->set_hidden (false, this);
 }
 
 void
@@ -1916,7 +1841,7 @@ ARDOUR_UI::map_transport_state ()
                auto_loop_button.unset_active_state ();
                play_selection_button.unset_active_state ();
                roll_button.unset_active_state ();
-               stop_button.set_active_state (Gtkmm2ext::Active);
+               stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
                return;
        }
 
@@ -1930,37 +1855,37 @@ ARDOUR_UI::map_transport_state ()
 
                if (_session->get_play_range()) {
 
-                       play_selection_button.set_active_state (Gtkmm2ext::Active);
+                       play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
                        roll_button.unset_active_state ();
                        auto_loop_button.unset_active_state ();
 
                } else if (_session->get_play_loop ()) {
 
-                       auto_loop_button.set_active_state (Gtkmm2ext::Active);
-                       play_selection_button.unset_active_state ();
-                       roll_button.unset_active_state ();
+                       auto_loop_button.set_active (true);
+                       play_selection_button.set_active (false);
+                       roll_button.set_active (false);
 
                } else {
 
-                       roll_button.set_active_state (Gtkmm2ext::Active);
-                       play_selection_button.unset_active_state ();
-                       auto_loop_button.unset_active_state ();
+                       roll_button.set_active (true);
+                       play_selection_button.set_active (false);
+                       auto_loop_button.set_active (false);
                }
 
-               if (join_play_range_button.active_state()) {
+               if (Config->get_always_play_range()) {
                        /* light up both roll and play-selection if they are joined */
-                       roll_button.set_active_state (Gtkmm2ext::Active);
-                       play_selection_button.set_active_state (Gtkmm2ext::Active);
+                       roll_button.set_active (true);
+                       play_selection_button.set_active (true);
                }
 
-               stop_button.unset_active_state ();
+               stop_button.set_active (false);
 
        } else {
 
-               stop_button.set_active_state (Gtkmm2ext::Active);
-               roll_button.unset_active_state ();
-               play_selection_button.unset_active_state ();
-               auto_loop_button.unset_active_state ();
+               stop_button.set_active (true);
+               roll_button.set_active (false);
+               play_selection_button.set_active (false);
+               auto_loop_button.set_active (false);
                update_disk_space ();
        }
 }
@@ -2059,7 +1984,7 @@ JACK, reconnect and save the session."), PROGRAM_NAME);
        }
 
        MessageDialog msg (*editor, msgstr);
-       pop_back_splash ();
+       pop_back_splash (msg);
        msg.run ();
 
        if (free_reason) {
@@ -2085,12 +2010,6 @@ ARDOUR_UI::do_engine_start ()
        return 0;
 }
 
-void
-ARDOUR_UI::setup_theme ()
-{
-       theme_manager->setup_theme();
-}
-
 void
 ARDOUR_UI::update_clocks ()
 {
@@ -2111,18 +2030,6 @@ ARDOUR_UI::stop_clocking ()
        clock_signal_connection.disconnect ();
 }
 
-void
-ARDOUR_UI::toggle_clocking ()
-{
-#if 0
-       if (clock_button.get_active()) {
-               start_clocking ();
-       } else {
-               stop_clocking ();
-       }
-#endif
-}
-
 gint
 ARDOUR_UI::_blink (void *arg)
 
@@ -2160,7 +2067,7 @@ ARDOUR_UI::stop_blinking ()
 }
 
 
-/** Ask the user for the name of a new shapshot and then take it.
+/** Ask the user for the name of a new snapshot and then take it.
  */
 
 void
@@ -2194,21 +2101,10 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
                bool do_save = (snapname.length() != 0);
 
                if (do_save) {
-                       if (snapname.find ('/') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a '/' character"));
-                               msg.run ();
-                               goto again;
-                       }
-                       if (snapname.find ('\\') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a '\\' character"));
-                               msg.run ();
-                               goto again;
-                       }
-                       if (snapname.find (':') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "snapshot names may not contain a ':' character"));
+                       char illegal = Session::session_name_is_legal(snapname);
+                       if (illegal) {
+                               MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+                                                    "snapshot names may not contain a '%1' character"), illegal));
                                msg.run ();
                                goto again;
                        }
@@ -2242,7 +2138,7 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        }
 }
 
-/** Ask the user for the name of a new shapshot and then take it.
+/** Ask the user for a new session name and then rename the session to it.
  */
 
 void
@@ -2269,15 +2165,11 @@ ARDOUR_UI::rename_session ()
                bool do_rename = (name.length() != 0);
 
                if (do_rename) {
-                       if (name.find ('/') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '/' character"));
-                               msg.run ();
-                               goto again;
-                       }
-                       if (name.find ('\\') != string::npos) {
-                               MessageDialog msg (_("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '\\' character"));
+                       char illegal = Session::session_name_is_legal (name);
+
+                       if (illegal) {
+                               MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+                                                                    "session names may not contain a '%1' character"), illegal));
                                msg.run ();
                                goto again;
                        }
@@ -2386,12 +2278,12 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 
        if (r == Session::Enabled || (r == Session::Recording && !h)) {
                if (onoff) {
-                       rec_button.set_active_state (Active);
+                       rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
                } else {
-                       rec_button.set_active_state (Mid);
+                       rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
                }
        } else if (r == Session::Recording && h) {
-               rec_button.set_active_state (Mid);
+               rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
        } else {
                rec_button.unset_active_state ();
        }
@@ -2461,7 +2353,7 @@ ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
        msg.set_title (_("Open Existing Session"));
        msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
        msg.set_position (Gtk::WIN_POS_MOUSE);
-       pop_back_splash ();
+       pop_back_splash (msg);
 
        switch (msg.run()) {
        case RESPONSE_YES:
@@ -2500,8 +2392,6 @@ ARDOUR_UI::build_session_from_nsd (const std::string& session_path, const std::s
                        bus_profile.input_ac = AutoConnectOption (0);
                }
 
-               /// @todo some minor tweaks.
-
                bus_profile.output_ac = AutoConnectOption (0);
 
                if (_startup->connect_outputs ()) {
@@ -2559,17 +2449,17 @@ ARDOUR_UI::idle_load (const std::string& path)
 }
 
 void
-ARDOUR_UI::end_loading_messages ()
+ARDOUR_UI::loading_message (const std::string& msg)
 {
-       // hide_splash ();
-}
+       if (ARDOUR_COMMAND_LINE::no_splash) {
+               return;
+       }
 
-void
-ARDOUR_UI::loading_message (const std::string& /*msg*/)
-{
-       // show_splash ();
-       // splash->message (msg);
-       flush_pending ();
+       show_splash ();
+       if (splash) {
+               splash->message (msg);
+               flush_pending ();
+       }
 }
 
 /** @param quit_on_cancel true if exit() should be called if the user clicks `cancel' in the new session dialog */
@@ -2657,19 +2547,13 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
 
                                session_path = _startup->session_folder();
 
-                               if (session_name.find ('/') != string::npos) {
-                                       MessageDialog msg (*_startup,
-                                                          _("To ensure compatibility with various systems\n"
-                                                            "session names may not contain a '/' character"));
-                                       msg.run ();
-                                       ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
-                                       continue;
-                               }
+                               char illegal = Session::session_name_is_legal (session_name);
 
-                               if (session_name.find ('\\') != string::npos) {
+                               if (illegal) {
                                        MessageDialog msg (*_startup,
-                                                          _("To ensure compatibility with various systems\n"
-                                                            "session names may not contain a '\\' character"));
+                                                          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;
@@ -2698,25 +2582,23 @@ ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, stri
                } else {
 
                        if (!likely_new) {
-                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
-                               msg.run ();
-                               ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
-                               continue;
-                       }
+                               if (_startup) {
+                                       pop_back_splash (*_startup);
+                               } else {
+                                       hide_splash ();
+                               }
 
-                       if (session_name.find ('/') != std::string::npos) {
-                               MessageDialog msg (*_startup,
-                                                  _("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '/' character"));
+                               MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
                        }
 
-                       if (session_name.find ('\\') != std::string::npos) {
-                               MessageDialog msg (*_startup,
-                                                  _("To ensure compatibility with various systems\n"
-                                                    "session names may not contain a '\\' character"));
+                       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));
                                msg.run ();
                                ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
                                continue;
@@ -2811,7 +2693,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                msg.set_title (_("Port Registration Error"));
                msg.set_secondary_text (_("Click the Close button to try again."));
                msg.set_position (Gtk::WIN_POS_CENTER);
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.present ();
 
                int response = msg.run ();
@@ -2840,7 +2722,7 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
                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 ();
+               pop_back_splash (msg);
                msg.present ();
 
                int response = msg.run ();
@@ -2920,7 +2802,7 @@ ARDOUR_UI::build_session (const std::string& path, const std::string& snap_name,
        catch (...) {
 
                MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
-               pop_back_splash ();
+               pop_back_splash (msg);
                msg.run ();
                return -1;
        }
@@ -3009,12 +2891,13 @@ ARDOUR_UI::show_splash ()
                try {
                        splash = new Splash;
                } catch (...) {
+                       cerr << "Splash could not be created\n";
                        return;
                }
        }
 
-       splash->show ();
        splash->present ();
+       splash->pop_front ();
        splash->queue_draw ();
        splash->get_window()->process_updates (true);
        flush_pending ();
@@ -3041,7 +2924,7 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis
                                    _("No files were ready for clean-up"),
                                    true,
                                    Gtk::MESSAGE_INFO,
-                                   (Gtk::ButtonsType)(Gtk::BUTTONS_OK)  );
+                                   Gtk::BUTTONS_OK);
                msgd.set_title (_("Clean-up"));
                msgd.set_secondary_text (_("If this seems suprising, \n\
 check for any existing snapshots.\n\
@@ -3113,9 +2996,9 @@ require some unused files to continue to exist."));
        }
 
        if (removed > 1) {
-               txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix));
+               txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
        } else {
-               txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix));
+               txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix, PROGRAM_NAME));
        }
 
        dhbox.pack_start (*dimage, true, false, 5);
@@ -3167,7 +3050,7 @@ ARDOUR_UI::cleanup ()
        MessageDialog checker (_("Are you sure you want to clean-up?"),
                                true,
                                Gtk::MESSAGE_QUESTION,
-                               (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
+                               Gtk::BUTTONS_NONE);
 
        checker.set_title (_("Clean-up"));
 
@@ -3215,7 +3098,7 @@ Clean-up will move all unused files to a \"dead\" location."));
 The following %1 files were not in use and \n\
 have been moved to:\n\n\
 %2\n\n\
-After a restart of Ardour,\n\n\
+After a restart of %5,\n\n\
 Session -> Clean-up -> Flush Wastebasket\n\n\
 will release an additional\n\
 %3 %4bytes of disk space.\n"),
@@ -3223,7 +3106,7 @@ will release an additional\n\
 The following file was not in use and \n\
 has been moved to:\n                           \
 %2\n\n\
-After a restart of Ardour,\n\n\
+After a restart of %5,\n\n\
 Session -> Clean-up -> Flush Wastebasket\n\n\
 will release an additional\n\
 %3 %4bytes of disk space.\n"
@@ -3266,6 +3149,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 
        if (add_route_dialog == 0) {
                add_route_dialog = new AddRouteDialog (_session);
+               add_route_dialog->set_position (WIN_POS_MOUSE);
                if (float_window) {
                        add_route_dialog->set_transient_for (*float_window);
                }
@@ -3302,7 +3186,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
        uint32_t input_chan = add_route_dialog->channels ();
        uint32_t output_chan;
        string name_template = add_route_dialog->name_template ();
-       bool track = add_route_dialog->track ();
+       PluginInfoPtr instrument = add_route_dialog->requested_instrument ();
        RouteGroup* route_group = add_route_dialog->route_group ();
 
        AutoConnectOption oac = Config->get_output_auto_connect();
@@ -3315,21 +3199,12 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 
        /* XXX do something with name template */
 
-       if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
-               if (track) {
-                       session_add_midi_track (route_group, count, name_template);
-               } else  {
-                       MessageDialog msg (*editor,
-                                       _("Sorry, MIDI Busses are not supported at this time."));
-                       msg.run ();
-                       //session_add_midi_bus();
-               }
+       if (add_route_dialog->midi_tracks_wanted()) {
+               session_add_midi_track (route_group, count, name_template, instrument);
+       } else if (add_route_dialog->audio_tracks_wanted()) {
+               session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count, name_template);
        } else {
-               if (track) {
-                       session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count, name_template);
-               } else {
-                       session_add_audio_bus (input_chan, output_chan, route_group, count, name_template);
-               }
+               session_add_audio_bus (input_chan, output_chan, route_group, count, name_template);
        }
 }
 
@@ -3587,13 +3462,13 @@ void
 ARDOUR_UI::update_transport_clocks (framepos_t pos)
 {
        if (Config->get_primary_clock_delta_edit_cursor()) {
-               primary_clock->set (pos, false, editor->get_preferred_edit_position(), 1);
+               primary_clock->set (pos, false, editor->get_preferred_edit_position());
        } else {
-               primary_clock->set (pos, 0, true);
+               primary_clock->set (pos);
        }
 
        if (Config->get_secondary_clock_delta_edit_cursor()) {
-               secondary_clock->set (pos, false, editor->get_preferred_edit_position(), 2);
+               secondary_clock->set (pos, false, editor->get_preferred_edit_position());
        } else {
                secondary_clock->set (pos);
        }
@@ -3611,7 +3486,7 @@ ARDOUR_UI::step_edit_status_change (bool yn)
        // we make insensitive
 
        if (yn) {
-               rec_button.set_active_state (Mid);
+               rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
                rec_button.set_sensitive (false);
        } else {
                rec_button.unset_active_state ();;
@@ -3629,13 +3504,10 @@ ARDOUR_UI::record_state_changed ()
                return;
        }
 
-       Session::RecordState const r = _session->record_status ();
-       bool const h = _session->have_rec_enabled_track ();
-
-       if (r == Session::Recording && h)  {
-               big_clock->set_widget_name ("BigClockRecording");
+       if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
+               big_clock->set_active (true);
        } else {
-               big_clock->set_widget_name ("BigClockNonRecording");
+               big_clock->set_active (false);
        }
 }
 
@@ -3876,11 +3748,19 @@ ARDOUR_UI::drop_process_buffers ()
 void
 ARDOUR_UI::feedback_detected ()
 {
-       MessageDialog d (
-               _("Something you have just done has generated a feedback path within Ardour's "
-                 "routing.  Until this feedback is removed, Ardour's output will be as it was "
-                  "before you made the feedback-generating connection.")
-               );
+       _feedback_exists = true;
+}
 
-       d.run ();
+void
+ARDOUR_UI::successful_graph_sort ()
+{
+       _feedback_exists = false;
+}
+
+void
+ARDOUR_UI::midi_panic ()
+{
+       if (_session) {
+               _session->midi_panic();
+       }
 }