stop-and-forget-capture should not toggle transport state, only stop it
[ardour.git] / gtk2_ardour / ardour_ui.cc
index 86a01e26aa0ae0f43600f8a677d65b623fb4c0fd..4778b6c47db0b94885da56cd8424e2123d4aa976 100644 (file)
 #include <sys/resource.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#endif
+
 #include <stdint.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -44,6 +49,7 @@
 
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/accelmap.h>
+#include <gtkmm/stock.h>
 
 #include "pbd/error.h"
 #include "pbd/basename.h"
@@ -71,6 +77,7 @@
 
 #include "ardour/ardour.h"
 #include "ardour/audio_backend.h"
+#include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
 #include "ardour/audiofilesource.h"
 #include "ardour/automation_watch.h"
 #include "ardour/filename_extensions.h"
 #include "ardour/filesystem_paths.h"
 #include "ardour/ltc_file_reader.h"
+#include "ardour/midi_track.h"
 #include "ardour/port.h"
 #include "ardour/plugin_manager.h"
 #include "ardour/process_thread.h"
 #include "ardour/profile.h"
 #include "ardour/recent_sessions.h"
+#include "ardour/record_enable_control.h"
 #include "ardour/session_directory.h"
 #include "ardour/session_route.h"
 #include "ardour/session_state_utils.h"
@@ -90,6 +99,9 @@
 #include "ardour/source_factory.h"
 #include "ardour/slave.h"
 #include "ardour/system_exec.h"
+#include "ardour/track.h"
+#include "ardour/vca_manager.h"
+#include "ardour/utils.h"
 
 #include "LuaBridge/LuaBridge.h"
 
@@ -224,14 +236,19 @@ libxml_structured_error_func (void* /* parsing_context*/,
 
        replace_all (msg, "\n", "");
 
-       if (err->file && err->line) {
-               error << X_("XML error: ") << msg << " in " << err->file << " at line " << err->line;
+       if (!msg.empty()) {
+               if (err->file && err->line) {
+                       error << X_("XML error: ") << msg << " in " << err->file << " at line " << err->line;
+
+                       if (err->int2) {
+                               error << ':' << err->int2;
+                       }
 
-               if (err->int2) {
-                       error << ':' << err->int2;
+                       error << endmsg;
+               } else {
+                       error << X_("XML error: ") << msg << endmsg;
                }
        }
-       error << endmsg;
 }
 
 
@@ -245,6 +262,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        , video_timeline(0)
        , global_actions (X_("global"))
        , ignore_dual_punch (false)
+       , main_window_visibility (0)
        , editor (0)
        , mixer (0)
        , nsm (0)
@@ -278,7 +296,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        , speaker_config_window (X_("speaker-config"), _("Speaker Configuration"))
        , add_route_dialog (X_("add-routes"), _("Add Tracks/Busses"))
        , about (X_("about"), _("About"))
-       , location_ui (X_("locations"), _("Locations"))
+       , location_ui (X_("locations"), S_("Ranges|Locations"))
        , route_params (X_("inspector"), _("Tracks and Busses"))
        , audio_midi_setup (X_("audio-midi-setup"), _("Audio/MIDI Setup"))
        , export_video_dialog (X_("video-export"), _("Video Export Dialog"))
@@ -315,10 +333,22 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
                _exit (0);
        }
 
+
+       if (string (VERSIONSTRING).find (".pre") != string::npos) {
+               /* check this is not being run from ./ardev etc. */
+               if (!running_from_source_tree ()) {
+                       pre_release_dialog ();
+               }
+       }
+
        if (theArdourUI == 0) {
                theArdourUI = this;
        }
 
+       /* track main window visibility */
+
+       main_window_visibility = new VisibilityTracker (_main_window);
+
        /* stop libxml from spewing to stdout/stderr */
 
        xmlSetGenericErrorFunc (this, libxml_generic_error_func);
@@ -366,6 +396,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
 
        ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
 
+       /* handle sr mismatch with a dialog - cross-thread from engine */
+       ARDOUR::Session::NotifyAboutSampleRateMismatch.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::sr_mismatch_message, this, _1, _2), gui_context ());
+
        /* handle requests to quit (coming from JACK session) */
 
        ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::finish, this), gui_context ());
@@ -455,6 +488,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        WM::Manager::instance().register_window (&audio_port_matrix);
        WM::Manager::instance().register_window (&midi_port_matrix);
 
+       /* do not retain position for add route dialog */
+       add_route_dialog.set_state_mask (WindowProxy::Size);
+
        /* Trigger setting up the color scheme and loading the GTK RC file */
 
        UIConfiguration::instance().load_rc_file (false);
@@ -467,6 +503,40 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
        attach_to_engine ();
 }
 
+void
+ARDOUR_UI::pre_release_dialog ()
+{
+       ArdourDialog d (_("Pre-Release Warning"), true, false);
+       d.add_button (Gtk::Stock::OK, Gtk::RESPONSE_OK);
+
+        Label* label = manage (new Label);
+        label->set_markup (string_compose (_("<b>Welcome to this pre-release build of %1 %2</b>\n\n\
+There are still several issues and bugs to be worked on,\n\
+as well as general workflow improvements, before this can be considered\n\
+release software. So, a few guidelines:\n\
+\n\
+1) Please do <b>NOT</b> use this software with the expectation that it is stable or reliable\n\
+   though it may be so, depending on your workflow.\n\
+2) Please wait for a helpful writeup of new features.\n\
+3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n\
+4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to report issues\n\
+   making sure to note the product version number as 5.0-pre.\n\
+5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and pass on comments.\n\
+6) Please <b>DO</b> join us on IRC for real time discussions about %1 %2. You\n\
+   can get there directly from within the program via the Help->Chat menu option.\n\
+\n\
+Full information on all the above can be found on the support page at\n\
+\n\
+                http://ardour.org/support\n\
+"), PROGRAM_NAME, VERSIONSTRING));
+
+        d.get_vbox()->set_border_width (12);
+        d.get_vbox()->pack_start (*label, false, false, 12);
+        d.get_vbox()->show_all ();
+
+        d.run ();
+}
+
 GlobalPortMatrixWindow*
 ARDOUR_UI::create_global_port_matrix (ARDOUR::DataType type)
 {
@@ -673,6 +743,7 @@ ARDOUR_UI::~ARDOUR_UI ()
                delete mixer; mixer = 0;
                delete nsm; nsm = 0;
                delete gui_object_state; gui_object_state = 0;
+               delete main_window_visibility;
                FastMeter::flush_pattern_cache ();
                PixFader::flush_pattern_cache ();
        }
@@ -731,7 +802,7 @@ ARDOUR_UI::configure_handler (GdkEventConfigure* /*conf*/)
 void
 ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
 {
-       const XMLProperty* prop;
+       XMLProperty const * prop;
 
        if ((prop = node.property ("roll")) != 0) {
                roll_controllable->set_id (prop->value());
@@ -1553,7 +1624,7 @@ void
 ARDOUR_UI::count_recenabled_streams (Route& route)
 {
        Track* track = dynamic_cast<Track*>(&route);
-       if (track && track->record_enabled()) {
+       if (track && track->rec_enable_control()->get_value()) {
                rec_enabled_streams += track->n_inputs().n_total();
        }
 }
@@ -1704,6 +1775,10 @@ ARDOUR_UI::open_recent_session ()
 
                can_return = false;
        }
+       if (splash && splash->is_visible()) {
+               // in 1 second, hide the splash screen
+               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
+       }
 }
 
 bool
@@ -1776,10 +1851,27 @@ ARDOUR_UI::open_session ()
        }
 }
 
+void
+ARDOUR_UI::session_add_vca (const string& name_template, uint32_t n)
+{
+       if (!_session) {
+               return;
+       }
+
+       _session->vca_manager().create_vca (n, name_template);
+}
 
 void
-ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& output, RouteGroup* route_group,
-                                   uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
+ARDOUR_UI::session_add_mixed_track (
+               const ChanCount& input,
+               const ChanCount& output,
+               RouteGroup* route_group,
+               uint32_t how_many,
+               const string& name_template,
+               bool strict_io,
+               PluginInfoPtr instrument,
+               Plugin::PresetRecord* pset,
+               ARDOUR::PresentationInfo::order_t order)
 {
        list<boost::shared_ptr<MidiTrack> > tracks;
 
@@ -1789,7 +1881,7 @@ ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& out
        }
 
        try {
-               tracks = _session->new_midi_track (input, output, instrument, ARDOUR::Normal, route_group, how_many, name_template);
+               tracks = _session->new_midi_track (input, output, instrument, pset, route_group, how_many, name_template, order, ARDOUR::Normal);
 
                if (tracks.size() != how_many) {
                        error << string_compose(P_("could not create %1 new mixed track", "could not create %1 new mixed tracks", how_many), how_many) << endmsg;
@@ -1797,24 +1889,72 @@ ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& out
        }
 
        catch (...) {
-               MessageDialog msg (_main_window,
-                                  string_compose (_("There are insufficient ports available\n\
-to create a new track or bus.\n\
-You should save %1, exit and\n\
-restart with more ports."), PROGRAM_NAME));
-               msg.run ();
+               display_insufficient_ports_message ();
+               return;
+       }
+
+       if (strict_io) {
+               for (list<boost::shared_ptr<MidiTrack> >::iterator i = tracks.begin(); i != tracks.end(); ++i) {
+                       (*i)->set_strict_io (true);
+               }
        }
 }
 
+void
+ARDOUR_UI::session_add_midi_bus (
+               RouteGroup* route_group,
+               uint32_t how_many,
+               const string& name_template,
+               bool strict_io,
+               PluginInfoPtr instrument,
+               Plugin::PresetRecord* pset,
+               ARDOUR::PresentationInfo::order_t order)
+{
+       RouteList routes;
+
+       if (_session == 0) {
+               warning << _("You cannot add a track without a session already loaded.") << endmsg;
+               return;
+       }
+
+       try {
+
+               routes = _session->new_midi_route (route_group, how_many, name_template, instrument, pset, PresentationInfo::MidiBus, order);
+               if (routes.size() != how_many) {
+                       error << string_compose(P_("could not create %1 new Midi Bus", "could not create %1 new Midi Busses", how_many), how_many) << endmsg;
+               }
+
+       }
+       catch (...) {
+               display_insufficient_ports_message ();
+               return;
+       }
+
+       if (strict_io) {
+               for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) {
+                       (*i)->set_strict_io (true);
+               }
+       }
+}
 
 void
-ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
+ARDOUR_UI::session_add_midi_route (
+               bool disk,
+               RouteGroup* route_group,
+               uint32_t how_many,
+               const string& name_template,
+               bool strict_io,
+               PluginInfoPtr instrument,
+               Plugin::PresetRecord* pset,
+               ARDOUR::PresentationInfo::order_t order)
 {
        ChanCount one_midi_channel;
        one_midi_channel.set (DataType::MIDI, 1);
 
        if (disk) {
-               session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, instrument);
+               session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, strict_io, instrument, pset, order);
+       } else {
+               session_add_midi_bus (route_group, how_many, name_template, strict_io, instrument, pset, order);
        }
 }
 
@@ -1826,8 +1966,9 @@ ARDOUR_UI::session_add_audio_route (
        ARDOUR::TrackMode mode,
        RouteGroup* route_group,
        uint32_t how_many,
-       string const & name_template
-       )
+       string const & name_template,
+       bool strict_io,
+       ARDOUR::PresentationInfo::order_t order)
 {
        list<boost::shared_ptr<AudioTrack> > tracks;
        RouteList routes;
@@ -1839,7 +1980,7 @@ ARDOUR_UI::session_add_audio_route (
 
        try {
                if (track) {
-                       tracks = _session->new_audio_track (input_channels, output_channels, mode, route_group, how_many, name_template);
+                       tracks = _session->new_audio_track (input_channels, output_channels, route_group, how_many, name_template, order, mode);
 
                        if (tracks.size() != how_many) {
                                error << string_compose (P_("could not create %1 new audio track", "could not create %1 new audio tracks", how_many), how_many)
@@ -1848,7 +1989,7 @@ ARDOUR_UI::session_add_audio_route (
 
                } else {
 
-                       routes = _session->new_audio_route (input_channels, output_channels, route_group, how_many, name_template);
+                       routes = _session->new_audio_route (input_channels, output_channels, route_group, how_many, name_template, PresentationInfo::AudioBus, order);
 
                        if (routes.size() != how_many) {
                                error << string_compose (P_("could not create %1 new audio bus", "could not create %1 new audio busses", how_many), how_many)
@@ -1858,14 +1999,30 @@ ARDOUR_UI::session_add_audio_route (
        }
 
        catch (...) {
-               MessageDialog msg (_main_window,
-                                  string_compose (_("There are insufficient ports available\n\
+               display_insufficient_ports_message ();
+               return;
+       }
+
+       if (strict_io) {
+               for (list<boost::shared_ptr<AudioTrack> >::iterator i = tracks.begin(); i != tracks.end(); ++i) {
+                       (*i)->set_strict_io (true);
+               }
+               for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) {
+                       (*i)->set_strict_io (true);
+               }
+       }
+}
+
+void
+ARDOUR_UI::display_insufficient_ports_message ()
+{
+       MessageDialog msg (_main_window,
+                       string_compose (_("There are insufficient ports available\n\
 to create a new track or bus.\n\
 You should save %1, exit and\n\
 restart with more ports."), PROGRAM_NAME));
-               pop_back_splash (msg);
-               msg.run ();
-       }
+       pop_back_splash (msg);
+       msg.run ();
 }
 
 void
@@ -1984,14 +2141,14 @@ ARDOUR_UI::trx_record_enable_all_tracks ()
                boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*r);
                assert (t);
 
-               if (t->record_enabled()) {
+               if (t->rec_enable_control()->get_value()) {
                        none_record_enabled = false;
                        break;
                }
        }
 
        if (none_record_enabled) {
-               _session->set_record_enabled (rl, true, Session::rt_cleanup);
+               _session->set_controls (route_list_to_control_list (rl, &Stripable::rec_enable_control), 1.0, Controllable::NoGroup);
        }
 
        return none_record_enabled;
@@ -2149,7 +2306,12 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
        if (affect_transport) {
                if (rolling) {
                        _session->request_stop (with_abort, true);
-               } else {
+
+               } else if (!with_abort) { /* with_abort == true means the
+                                          * command was intended to stop
+                                          * transport, not start.
+                                          */
+
                        /* the only external sync condition we can be in here
                         * would be Engine (JACK) sync, in which case we still
                         * want to do this.
@@ -2276,7 +2438,7 @@ ARDOUR_UI::transport_forward (int option)
 }
 
 void
-ARDOUR_UI::toggle_record_enable (uint32_t rid)
+ARDOUR_UI::toggle_record_enable (uint16_t rid)
 {
        if (!_session) {
                return;
@@ -2284,12 +2446,12 @@ ARDOUR_UI::toggle_record_enable (uint32_t rid)
 
        boost::shared_ptr<Route> r;
 
-       if ((r = _session->route_by_remote_id (rid)) != 0) {
+       if ((r = _session->get_remote_nth_route (rid)) != 0) {
 
                boost::shared_ptr<Track> t;
 
                if ((t = boost::dynamic_pointer_cast<Track>(r)) != 0) {
-                       t->set_record_enabled (!t->record_enabled(), Controllable::UseGroup);
+                       t->rec_enable_control()->set_value (!t->rec_enable_control()->get_value(), Controllable::UseGroup);
                }
        }
 }
@@ -2559,7 +2721,7 @@ ARDOUR_UI::snapshot_session (bool switch_to_it)
        prompter.set_name ("Prompter");
        prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
        if (switch_to_it) {
-               prompter.set_title (_("Save as..."));
+               prompter.set_title (_("Snapshot and switch"));
                prompter.set_prompt (_("New session name"));
        } else {
                prompter.set_title (_("Take Snapshot"));
@@ -3197,6 +3359,10 @@ ARDOUR_UI::close_session()
        if (get_session_parameters (true, false)) {
                exit (1);
        }
+       if (splash && splash->is_visible()) {
+               // in 1 second, hide the splash screen
+               Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
+       }
 }
 
 /** @param snap_name Snapshot name (without .ardour suffix).
@@ -3797,15 +3963,15 @@ ARDOUR_UI::cleanup_peakfiles ()
        }
 }
 
-void
-ARDOUR_UI::setup_order_hint (AddRouteDialog::InsertAt place)
+PresentationInfo::order_t
+ARDOUR_UI::translate_order (AddRouteDialog::InsertAt place)
 {
-       uint32_t order_hint = UINT32_MAX;
-
        if (editor->get_selection().tracks.empty()) {
-               return;
+               return PresentationInfo::max_order;
        }
 
+       PresentationInfo::order_t order_hint = PresentationInfo::max_order;
+
        /*
          we want the new routes to have their order keys set starting from
          the highest order key in the selection + 1 (if available).
@@ -3814,42 +3980,21 @@ ARDOUR_UI::setup_order_hint (AddRouteDialog::InsertAt place)
        if (place == AddRouteDialog::AfterSelection) {
                RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView*> (editor->get_selection().tracks.back());
                if (rtav) {
-                       order_hint = rtav->route()->order_key();
+                       order_hint = rtav->route()->presentation_info().order();
                        order_hint++;
                }
        } else if (place == AddRouteDialog::BeforeSelection) {
                RouteTimeAxisView *rtav = dynamic_cast<RouteTimeAxisView*> (editor->get_selection().tracks.front());
                if (rtav) {
-                       order_hint = rtav->route()->order_key();
+                       order_hint = rtav->route()->presentation_info().order();
                }
        } else if (place == AddRouteDialog::First) {
                order_hint = 0;
        } else {
-               /* leave order_hint at UINT32_MAX */
+               /* leave order_hint at max_order */
        }
 
-       if (order_hint == UINT32_MAX) {
-               /** AddRouteDialog::Last or selection with first/last not a RouteTimeAxisView
-                * not setting an order hint will place new routes last.
-                */
-               return;
-       }
-
-       _session->set_order_hint (order_hint);
-
-       /* create a gap in the existing route order keys to accomodate new routes.*/
-       boost::shared_ptr <RouteList> rd = _session->get_routes();
-       for (RouteList::iterator ri = rd->begin(); ri != rd->end(); ++ri) {
-               boost::shared_ptr<Route> rt (*ri);
-
-               if (rt->is_monitor()) {
-                       continue;
-               }
-
-               if (rt->order_key () >= order_hint) {
-                       rt->set_order_key (rt->order_key () + add_route_dialog->count());
-               }
-       }
+       return order_hint;
 }
 
 void
@@ -3867,9 +4012,11 @@ ARDOUR_UI::start_duplicate_routes ()
 }
 
 void
-ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
+ARDOUR_UI::add_route ()
 {
-       int count;
+       if (!add_route_dialog.get (false)) {
+               add_route_dialog->signal_response().connect (sigc::mem_fun (*this, &ARDOUR_UI::add_route_dialog_finished));
+       }
 
        if (!_session) {
                return;
@@ -3880,7 +4027,14 @@ ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
                return;
        }
 
-       ResponseType r = (ResponseType) add_route_dialog->run ();
+       add_route_dialog->set_position (WIN_POS_MOUSE);
+       add_route_dialog->present();
+}
+
+void
+ARDOUR_UI::add_route_dialog_finished (int r)
+{
+       int count;
 
        add_route_dialog->hide();
 
@@ -3896,8 +4050,7 @@ ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
                return;
        }
 
-       setup_order_hint(add_route_dialog->insert_at());
-
+       PresentationInfo::order_t order = translate_order (add_route_dialog->insert_at());
        string template_path = add_route_dialog->track_template();
        DisplaySuspender ds;
 
@@ -3916,6 +4069,7 @@ ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
        PluginInfoPtr instrument = add_route_dialog->requested_instrument ();
        RouteGroup* route_group = add_route_dialog->route_group ();
        AutoConnectOption oac = Config->get_output_auto_connect();
+       bool strict_io = add_route_dialog->use_strict_io ();
 
        if (oac & AutoConnectMaster) {
                output_chan.set (DataType::AUDIO, (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan.n_audio()));
@@ -3928,16 +4082,22 @@ ARDOUR_UI::add_route (Gtk::Window* /* ignored */)
 
        switch (add_route_dialog->type_wanted()) {
        case AddRouteDialog::AudioTrack:
-               session_add_audio_track (input_chan.n_audio(), output_chan.n_audio(), add_route_dialog->mode(), route_group, count, name_template);
+               session_add_audio_track (input_chan.n_audio(), output_chan.n_audio(), add_route_dialog->mode(), route_group, count, name_template, strict_io, order);
                break;
        case AddRouteDialog::MidiTrack:
-               session_add_midi_track (route_group, count, name_template, instrument);
+               session_add_midi_track (route_group, count, name_template, strict_io, instrument, 0, order);
                break;
        case AddRouteDialog::MixedTrack:
-               session_add_mixed_track (input_chan, output_chan, route_group, count, name_template, instrument);
+               session_add_mixed_track (input_chan, output_chan, route_group, count, name_template, strict_io, instrument, 0, order);
                break;
        case AddRouteDialog::AudioBus:
-               session_add_audio_bus (input_chan.n_audio(), output_chan.n_audio(), route_group, count, name_template);
+               session_add_audio_bus (input_chan.n_audio(), output_chan.n_audio(), route_group, count, name_template, strict_io, order);
+               break;
+       case AddRouteDialog::MidiBus:
+               session_add_midi_bus (route_group, count, name_template, strict_io, instrument, 0, order);
+               break;
+       case AddRouteDialog::VCAMaster:
+               session_add_vca (name_template, count);
                break;
        }
 }
@@ -3958,6 +4118,7 @@ ARDOUR_UI::add_lua_script ()
                default:
                        return;
        }
+       ss.hide();
 
        std::string script = "";
 
@@ -3970,7 +4131,7 @@ ARDOUR_UI::add_lua_script ()
                return;
        }
 
-       LuaScriptParamList lsp = LuaScripting::session_script_params (spi);
+       LuaScriptParamList lsp = LuaScriptParams::script_params (spi, "sess_params");
        std::vector<std::string> reg = _session->registered_lua_functions ();
 
        ScriptParameterDialog spd (_("Set Script Parameters"), spi, reg, lsp);
@@ -4737,6 +4898,21 @@ audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual
         return 1;
 }
 
+void
+ARDOUR_UI::sr_mismatch_message (framecnt_t desired, framecnt_t actual)
+{
+       MessageDialog msg (string_compose (_("\
+This session was created with a sample rate of %1 Hz, but\n\
+%2 is currently running at %3 Hz.\n\
+Audio will be recorded and played at the wrong sample rate.\n\
+Re-Configure the Audio Engine in\n\
+Menu > Window > Audio/Midi Setup"),
+                               desired, PROGRAM_NAME, actual),
+                       true,
+                       Gtk::MESSAGE_WARNING);
+       msg.run ();
+}
+
 void
 ARDOUR_UI::use_config ()
 {
@@ -5009,7 +5185,7 @@ ARDOUR_UI::session_format_mismatch (std::string xml_path, std::string backup_pat
 
        MessageDialog msg (string_compose (_("%4This is a session from an older version of %3%5\n\n"
                                             "%3 has copied the old session file\n\n%6%1%7\n\nto\n\n%6%2%7\n\n"
-                                            "From now on, use the -2000 version with older versions of %3"),
+                                            "From now on, use the backup copy with older versions of %3"),
                                           xml_path, backup_path, PROGRAM_NAME,
                                           start_big, end_big,
                                           start_mono, end_mono), true);
@@ -5051,10 +5227,15 @@ 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);
 
-       int response;
+       if (Config->get_try_autostart_engine () || getenv ("TRY_AUTOSTART_ENGINE")) {
+               audio_midi_setup->try_autostart ();
+               if (ARDOUR::AudioEngine::instance()->running()) {
+                       return 0;
+               }
+       }
 
        while (true) {
-               response = audio_midi_setup->run();
+               int response = audio_midi_setup->run();
                switch (response) {
                case Gtk::RESPONSE_OK:
                        if (!AudioEngine::instance()->running()) {
@@ -5193,16 +5374,16 @@ ARDOUR_UI::setup_toplevel_window (Gtk::Window& window, const string& name, void*
 
        if (window_icons.empty()) {
                Glib::RefPtr<Gdk::Pixbuf> icon;
-               if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
+               if ((icon = ::get_icon (PROGRAM_NAME "-icon_16px")) != 0) {
                        window_icons.push_back (icon);
                }
-               if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
+               if ((icon = ::get_icon (PROGRAM_NAME "-icon_22px")) != 0) {
                        window_icons.push_back (icon);
                }
-               if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
+               if ((icon = ::get_icon (PROGRAM_NAME "-icon_32px")) != 0) {
                        window_icons.push_back (icon);
                }
-               if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
+               if ((icon = ::get_icon (PROGRAM_NAME "-icon_48px")) != 0) {
                        window_icons.push_back (icon);
                }
        }
@@ -5286,7 +5467,7 @@ ARDOUR_UI::key_event_handler (GdkEventKey* ev, Gtk::Window* event_window)
 static Gtkmm2ext::Bindings*
 get_bindings_from_widget_heirarchy (GtkWidget* w)
 {
-       void* p;
+       void* p = NULL;
 
        while (w) {
                if ((p = g_object_get_data (G_OBJECT(w), "ardour-bindings")) != 0) {
@@ -5329,7 +5510,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
                }
        }
 
-        DEBUG_TRACE (DEBUG::Accelerators, string_compose ("Win = %1 focus = %7 (%8) Key event: code = %2  state = %3 special handling ? %4 magic widget focus ? %5 focus widget %6 named %7 mods ? %8\n",
+        DEBUG_TRACE (DEBUG::Accelerators, string_compose ("Win = %1 [title = %9] focus = %7 (%8) Key event: code = %2  state = %3 special handling ? %4 magic widget focus ? %5 focus widget %6 named %7 mods ? %8\n",
                                                           win,
                                                           ev->keyval,
                                                          show_gdk_event_state (ev->state),
@@ -5337,7 +5518,8 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
                                                           Keyboard::some_magic_widget_has_focus(),
                                                          focus,
                                                           (focus ? gtk_widget_get_name (focus) : "no focus widget"),
-                                                          ((ev->state & mask) ? "yes" : "no")));
+                                                          ((ev->state & mask) ? "yes" : "no"),
+                                                          window.get_title()));
 
        /* This exists to allow us to override the way GTK handles
           key events. The normal sequence is:
@@ -5447,7 +5629,7 @@ ARDOUR_UI::key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey
 void
 ARDOUR_UI::load_bindings ()
 {
-       if ((global_bindings = Bindings::get_bindings ("global", global_actions)) == 0) {
+       if ((global_bindings = Bindings::get_bindings (X_("Global"), global_actions)) == 0) {
                error << _("Global keybindings are missing") << endmsg;
        }
 }
@@ -5456,12 +5638,9 @@ void
 ARDOUR_UI::cancel_solo ()
 {
        if (_session) {
-               if (_session->soloing()) {
-                       _session->set_solo (_session->get_routes(), false);
-               } else if (_session->listening()) {
-                       _session->set_listen (_session->get_routes(), false);
+               if (_session) {
+                       _session->set_controls (route_list_to_control_list (_session->get_routes(), &Stripable::solo_control), 0.0, Controllable::NoGroup);
                }
-
                _session->clear_all_solo_state (_session->get_routes()); // safeguard, ideally this won't do anything, check the log-window
        }
 }