X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.cc;h=23df74e6fd07f9342a978efb8b64d19fa225947c;hb=8e59a26ccf13de93ac681d761bad09cd6bcf0c90;hp=838588487b3d609d4f139c1265e9a982a902f892;hpb=6d523705589e87a5f85cd0a8c5fd3427543b9799;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 838588487b..23df74e6fd 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2007 Paul Davis 
+    Copyright (C) 1999-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -44,13 +44,13 @@
 #include "pbd/memento_command.h"
 #include "pbd/file_utils.h"
 
-#include <gtkmm2ext/gtk_ui.h>
-#include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/click_box.h>
-#include <gtkmm2ext/fastmeter.h>
-#include <gtkmm2ext/stop_signal.h>
-#include <gtkmm2ext/popup.h>
-#include <gtkmm2ext/window_title.h>
+#include "gtkmm2ext/gtk_ui.h"
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/click_box.h"
+#include "gtkmm2ext/fastmeter.h"
+#include "gtkmm2ext/stop_signal.h"
+#include "gtkmm2ext/popup.h"
+#include "gtkmm2ext/window_title.h"
 
 #include "midi++/manager.h"
 
@@ -95,6 +95,7 @@ typedef uint64_t microseconds_t;
 #include "route_time_axis.h"
 #include "startup.h"
 #include "engine_dialog.h"
+#include "processor_box.h"
 
 #include "i18n.h"
 
@@ -102,7 +103,6 @@ using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtkmm2ext;
 using namespace Gtk;
-using namespace sigc;
 
 ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
 UIConfiguration *ARDOUR_UI::ui_config = 0;
@@ -114,12 +114,12 @@ sigc::signal<void,nframes_t, bool, nframes_t> ARDOUR_UI::Clock;
 
 ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
-	: Gtkmm2ext::UI (X_("Ardour"), argcp, argvp),
-	  
-	  primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, false, true),
-	  secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, false, true),
-	  preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, true),
-	  postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, true),
+	: Gtkmm2ext::UI (X_("gui"), argcp, argvp),
+
+	  primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true),
+	  secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true),
+	  preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, false, true),
+	  postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, false, true),
 
 	  /* preroll stuff */
 
@@ -128,7 +128,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
 	  /* big clock */
 
-	  big_clock (X_("bigclock"), false, "BigClockNonRecording", true, false, true),
+	  big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, true),
 
 	  /* transport */
 
@@ -149,7 +149,7 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	  auto_loop_button (auto_loop_controllable),
 	  play_selection_button (play_selection_controllable),
 	  rec_button (rec_controllable),
-	  
+
 	  shuttle_units_button (_("% ")),
 
 	  punch_in_button (_("Punch In")),
@@ -169,10 +169,15 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	using namespace Gtk::Menu_Helpers;
 
 	Gtkmm2ext::init();
-	
+
 
 #ifdef TOP_MENUBAR
-	_auto_display_errors = false;
+	// _auto_display_errors = false;
+	/*
+	 * This was commented out as it wasn't defined
+	 * in A3 IIRC.  If this is not needed it should
+	 * be completely removed.
+	 */
 #endif
 
 	about = 0;
@@ -185,10 +190,9 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 
 	ui_config = new UIConfiguration();
 	theme_manager = new ThemeManager();
-	
+
 	editor = 0;
 	mixer = 0;
-	session = 0;
 	editor = 0;
 	engine = 0;
 	_session_is_new = false;
@@ -198,7 +202,8 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	_will_create_new_session_automatically = false;
 	add_route_dialog = 0;
 	route_params = 0;
-	option_editor = 0;
+	rc_option_editor = 0;
+	session_option_editor = 0;
 	location_ui = 0;
 	open_session_selector = 0;
 	have_configure_timeout = false;
@@ -226,57 +231,64 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	shuttle_unit_menu = 0;
 
         // We do not have jack linked in yet so;
-        
+
 	last_shuttle_request = last_peak_grab = 0; //  get_microseconds();
-	
-	ARDOUR::Diskstream::DiskOverrun.connect (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
-	ARDOUR::Diskstream::DiskUnderrun.connect (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
+
+	ARDOUR::Diskstream::DiskOverrun.connect (forever_connections, boost::bind (&ARDOUR_UI::disk_overrun_handler, this), gui_context());
+	ARDOUR::Diskstream::DiskUnderrun.connect (forever_connections, boost::bind (&ARDOUR_UI::disk_underrun_handler, this), gui_context());
 
 	/* handle dialog requests */
 
-	ARDOUR::Session::Dialog.connect (mem_fun(*this, &ARDOUR_UI::session_dialog));
+	ARDOUR::Session::Dialog.connect (forever_connections, ui_bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
 
-	/* handle pending state with a dialog */
+	/* handle pending state with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
-	ARDOUR::Session::AskAboutPendingState.connect (mem_fun(*this, &ARDOUR_UI::pending_state_dialog));
+	ARDOUR::Session::AskAboutPendingState.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::pending_state_dialog, this));
 
-	/* handle sr mismatch with a dialog */
+	/* handle sr mismatch with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
 
-	ARDOUR::Session::AskAboutSampleRateMismatch.connect (mem_fun(*this, &ARDOUR_UI::sr_mismatch_dialog));
+	ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
 
 	/* lets get this party started */
 
-    	try {
+	try {
 		if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) {
 			throw failed_constructor ();
 		}
 
 		setup_gtk_ardour_enums ();
-		Config->set_current_owner (ConfigVariableBase::Interface);
 		setup_profile ();
 
 		GainMeter::setup_slider_pix ();
 		RouteTimeAxisView::setup_slider_pix ();
+		SendProcessorEntry::setup_slider_pix ();
+		SessionEvent::create_per_thread_pool ("GUI", 512);
 
 	} catch (failed_constructor& err) {
 		error << _("could not initialize Ardour.") << endmsg;
 		// pass it on up
 		throw;
-	} 
+	}
 
 	/* we like keyboards */
 
-	keyboard = new Keyboard;
+	keyboard = new ArdourKeyboard;
+
+	XMLNode* node = ARDOUR_UI::instance()->keyboard_settings();
+	if (node) {
+		keyboard->set_state (*node, Stateful::loading_state_version);
+	}
 
 	reset_dpi();
 
-	starting.connect (mem_fun(*this, &ARDOUR_UI::startup));
-	stopping.connect (mem_fun(*this, &ARDOUR_UI::shutdown));
+	starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup));
+	stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown));
 
 	platform_setup ();
 }
 
-void
+/** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
+bool
 ARDOUR_UI::run_startup (bool should_be_new)
 {
 	if (_startup == 0) {
@@ -288,9 +300,14 @@ ARDOUR_UI::run_startup (bool should_be_new)
 
 	main().run();
 
-	/* we don't return here until the startup assistant is finished */	
-
 	_startup->hide ();
+
+	switch (_startup->response()) {
+	case RESPONSE_OK:
+		return true;
+	default:
+		return false;
+	}
 }
 
 int
@@ -304,7 +321,7 @@ ARDOUR_UI::create_engine ()
 
 	loading_message (_("Starting audio engine"));
 
-	try { 
+	try {
 		engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name);
 
 	} catch (...) {
@@ -312,10 +329,10 @@ ARDOUR_UI::create_engine ()
 		return -1;
 	}
 
-	engine->Stopped.connect (mem_fun(*this, &ARDOUR_UI::engine_stopped));
-	engine->Running.connect (mem_fun(*this, &ARDOUR_UI::engine_running));
-	engine->Halted.connect (mem_fun(*this, &ARDOUR_UI::engine_halted));
-	engine->SampleRateChanged.connect (mem_fun(*this, &ARDOUR_UI::update_sample_rate));
+	engine->Stopped.connect (forever_connections, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
+	engine->Running.connect (forever_connections, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
+	engine->Halted.connect (forever_connections, boost::bind (&ARDOUR_UI::engine_halted, this), gui_context());
+	engine->SampleRateChanged.connect (forever_connections, ui_bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
 
 	post_engine ();
 
@@ -330,6 +347,8 @@ ARDOUR_UI::post_engine ()
 
 	MIDI::Manager::instance()->set_api_data (engine->jack());
 	setup_midi ();
+	
+	ARDOUR::init_post_engine ();
 
 	ActionManager::init ();
 	_tooltips.enable();
@@ -361,10 +380,6 @@ ARDOUR_UI::post_engine ()
 
 	blink_timeout_tag = -1;
 
-	/* the global configuration object is now valid */
-
-	use_config ();
-
 	/* this being a GUI and all, we want peakfiles */
 
 	AudioFileSource::set_build_peakfiles (true);
@@ -376,30 +391,34 @@ ARDOUR_UI::post_engine ()
 		primary_clock.set_mode (AudioClock::BBT);
 		secondary_clock.set_mode (AudioClock::MinSec);
 	}  else {
-		primary_clock.set_mode (AudioClock::SMPTE);
+		primary_clock.set_mode (AudioClock::Timecode);
 		secondary_clock.set_mode (AudioClock::BBT);
 	}
 
 	/* start the time-of-day-clock */
-	
+
 #ifndef GTKOSX
 	/* OS X provides an always visible wallclock, so don't be stupid */
 	update_wall_clock ();
-	Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
+	Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
 #endif
 
 	update_disk_space ();
 	update_cpu_load ();
 	update_sample_rate (engine->frame_rate());
 
+	Config->ParameterChanged.connect (forever_connections, ui_bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
+	boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
+	Config->map_parameters (pc);
+
 	/* now start and maybe save state */
 
 	if (do_engine_start () == 0) {
-		if (session && _session_is_new) {
-			/* we need to retain initial visual 
-			   settings for a new session 
+		if (_session && _session_is_new) {
+			/* we need to retain initial visual
+			   settings for a new session
 			*/
-			session->save_state ("");
+			_session->save_state ("");
 		}
 	}
 }
@@ -444,15 +463,15 @@ ARDOUR_UI::configure_timeout ()
 }
 
 gboolean
-ARDOUR_UI::configure_handler (GdkEventConfigure* conf)
+ARDOUR_UI::configure_handler (GdkEventConfigure* /*conf*/)
 {
 	if (have_configure_timeout) {
 		last_configure_time = get_microseconds();
 	} else {
-		Glib::signal_timeout().connect (mem_fun(*this, &ARDOUR_UI::configure_timeout), 100);
+		Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::configure_timeout), 100);
 		have_configure_timeout = true;
 	}
-		
+
 	return FALSE;
 }
 
@@ -519,7 +538,7 @@ ARDOUR_UI::save_ardour_state ()
 	if (!keyboard || !mixer || !editor) {
 		return;
 	}
-	
+
 	/* XXX this is all a bit dubious. add_extra_xml() uses
 	   a different lifetime model from add_instant_xml().
 	*/
@@ -536,9 +555,9 @@ ARDOUR_UI::save_ardour_state ()
 	XMLNode enode(static_cast<Stateful*>(editor)->get_state());
 	XMLNode mnode(mixer->get_state());
 
-	if (session) {
-		session->add_instant_xml (enode);
-		session->add_instant_xml (mnode);
+	if (_session) {
+		_session->add_instant_xml (enode);
+		_session->add_instant_xml (mnode);
 	} else {
 		Config->add_instant_xml (enode);
 		Config->add_instant_xml (mnode);
@@ -552,7 +571,7 @@ ARDOUR_UI::autosave_session ()
 {
 	if (g_main_depth() > 1) {
 		/* inside a recursive main loop,
-		   give up because we may not be able to 
+		   give up because we may not be able to
 		   take a lock.
 		*/
 		return 1;
@@ -562,8 +581,8 @@ ARDOUR_UI::autosave_session ()
                 return 1;
 	}
 
-        if (session) {
-                session->maybe_write_autosave();
+        if (_session) {
+                _session->maybe_write_autosave();
         }
 
 	return 1;
@@ -572,20 +591,20 @@ ARDOUR_UI::autosave_session ()
 void
 ARDOUR_UI::update_autosave ()
 {
-	ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::update_autosave));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_autosave)
 
-	if (session->dirty()) {
+	if (_session && _session->dirty()) {
 		if (_autosave_connection.connected()) {
 			_autosave_connection.disconnect();
 		}
 
-		_autosave_connection = Glib::signal_timeout().connect (mem_fun (*this, &ARDOUR_UI::autosave_session),
+		_autosave_connection = Glib::signal_timeout().connect (sigc::mem_fun (*this, &ARDOUR_UI::autosave_session),
 				Config->get_periodic_safety_backup_interval() * 1000);
 
 	} else {
 		if (_autosave_connection.connected()) {
 			_autosave_connection.disconnect();
-		}               
+		}
 	}
 }
 
@@ -603,7 +622,7 @@ ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
 			   false,
 			   Gtk::MESSAGE_INFO,
 			   Gtk::BUTTONS_NONE);
-	
+
 	if (we_set_params) {
 		win.set_secondary_text(_("There are several possible reasons:\n\
 \n\
@@ -629,10 +648,10 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 		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 ();
@@ -646,17 +665,19 @@ void
 ARDOUR_UI::startup ()
 {
 	XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
-	
+
 	if (audio_setup && _startup && _startup->engine_control()) {
 		_startup->engine_control()->set_state (*audio_setup);
 	}
-	
-	if (get_session_parameters (ARDOUR_COMMAND_LINE::new_session)) {
+
+	if (get_session_parameters (true, ARDOUR_COMMAND_LINE::new_session)) {
 		exit (1);
 	}
 
+	use_config ();
+
 	goto_editor_window ();
-	
+
 	BootMessage (_("Ardour is ready for use"));
 	show ();
 }
@@ -693,24 +714,24 @@ ARDOUR_UI::check_memory_locking ()
 		if (getrlimit (RLIMIT_MEMLOCK, &limits)) {
 			return;
 		}
-		
+
 		if (limits.rlim_cur != RLIM_INFINITY) {
 
 			if (ram == 0 || ((double) limits.rlim_cur / ram) < 0.75) {
-			
+
 
 				MessageDialog msg (_("WARNING: Your system has a limit for maximum amount of locked memory. "
 						     "This might cause Ardour to run out of memory before your system "
 						     "runs out of memory. \n\n"
 						     "You can view the memory limit with 'ulimit -l', "
 						     "and it is normally controlled by /etc/security/limits.conf"));
-				
+
 				VBox* vbox = msg.get_vbox();
 				HBox hbox;
 				CheckButton cb (_("Do not show this window again"));
-				
-				cb.signal_toggled().connect (mem_fun (*this, &ARDOUR_UI::no_memory_warning));
-				
+
+				cb.signal_toggled().connect (sigc::mem_fun (*this, &ARDOUR_UI::no_memory_warning));
+
 				hbox.pack_start (cb, true, false);
 				vbox->pack_start (hbox);
 				cb.show();
@@ -718,7 +739,7 @@ ARDOUR_UI::check_memory_locking ()
 				hbox.show ();
 
 				pop_back_splash ();
-				
+
 				editor->ensure_float (msg);
 				msg.run ();
 			}
@@ -731,14 +752,14 @@ ARDOUR_UI::check_memory_locking ()
 void
 ARDOUR_UI::finish()
 {
-	if (session) {
+	if (_session) {
 
-		if (session->transport_rolling()) {
-			session->request_stop ();
-			usleep (2500000);
+		if (_session->transport_rolling()) {
+			_session->request_stop ();
+			usleep (250000);
 		}
 
-		if (session->dirty()) {
+		if (_session->dirty()) {
 			switch (ask_about_saving_session(_("quit"))) {
 			case -1:
 				return;
@@ -747,7 +768,7 @@ ARDOUR_UI::finish()
 				/* use the default name */
 				if (save_state_canfail ("")) {
 					/* failed - don't quit */
-					MessageDialog msg (*editor, 
+					MessageDialog msg (*editor,
 							   _("\
 Ardour was unable to save your session.\n\n\
 If you still wish to quit, please use the\n\n\
@@ -761,8 +782,16 @@ If you still wish to quit, please use the\n\n\
 				break;
 			}
 		}
+
+		second_connection.disconnect ();
+		point_one_second_connection.disconnect ();
+		point_oh_five_second_connection.disconnect ();
+		point_zero_one_second_connection.disconnect();
 		
-		session->set_deletion_in_progress ();
+		// _session->set_deletion_in_progress ();
+		_session->remove_pending_capture_state ();
+		delete _session;
+		_session = 0;
 	}
 
 	ArdourDialog::close_all_dialogs ();
@@ -796,14 +825,14 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
 	string prompt;
 	string type;
 
-	if (session->snap_name() == session->name()) {
+	if (_session->snap_name() == _session->name()) {
 		type = _("session");
 	} else {
 		type = _("snapshot");
 	}
-	prompt = string_compose(_("The %1\"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"), 
-			 type, session->snap_name());
-	
+	prompt = string_compose(_("The %1 \"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
+			 type, _session->snap_name());
+
 	prompt_label.set_text (prompt);
 	prompt_label.set_name (X_("PrompterLabel"));
 	prompt_label.set_alignment(ALIGN_LEFT, ALIGN_TOP);
@@ -841,7 +870,7 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
 
 	return -1;
 }
-	
+
 gint
 ARDOUR_UI::every_second ()
 {
@@ -873,7 +902,7 @@ ARDOUR_UI::update_sample_rate (nframes_t ignored)
 {
 	char buf[32];
 
-	ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::update_sample_rate), ignored));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_sample_rate, ignored)
 
 	if (!engine->connected()) {
 
@@ -882,13 +911,13 @@ ARDOUR_UI::update_sample_rate (nframes_t ignored)
 	} else {
 
 		nframes_t rate = engine->frame_rate();
-		
+
 		if (fmod (rate, 1000.0) != 0.0) {
-			snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"), 
+			snprintf (buf, sizeof (buf), _("%.1f kHz / %4.1f ms"),
 				  (float) rate/1000.0f,
 				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
 		} else {
-			snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"), 
+			snprintf (buf, sizeof (buf), _("%u kHz / %4.1f ms"),
 				  rate/1000,
 				  (engine->frames_per_cycle() / (float) rate) * 1000.0f);
 		}
@@ -909,10 +938,16 @@ void
 ARDOUR_UI::update_buffer_load ()
 {
 	char buf[64];
+	uint32_t c, p;
+
+	if (_session) {
+		c = _session->capture_load ();
+		p = _session->playback_load ();
 
-	if (session) {
-		snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"), 
-			  session->playback_load(), session->capture_load());
+		push_buffer_stats (c, p);
+
+		snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"),
+			  _session->playback_load(), _session->capture_load());
 		buffer_load_label.set_text (buf);
 	} else {
 		buffer_load_label.set_text ("");
@@ -931,48 +966,48 @@ ARDOUR_UI::count_recenabled_streams (Route& route)
 void
 ARDOUR_UI::update_disk_space()
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 
-	nframes_t frames = session->available_capture_duration();
+	nframes_t frames = _session->available_capture_duration();
 	char buf[64];
-	nframes_t fr = session->frame_rate();
-	
+	nframes_t fr = _session->frame_rate();
+
 	if (frames == max_frames) {
 		strcpy (buf, _("Disk: 24hrs+"));
 	} else {
 		rec_enabled_streams = 0;
-		session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
-		
+		_session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
+
 		if (rec_enabled_streams) {
 			frames /= rec_enabled_streams;
 		}
-		
+
 		int hrs;
 		int mins;
 		int secs;
-	
+
 		hrs  = frames / (fr * 3600);
 		frames -= hrs * fr * 3600;
 		mins = frames / (fr * 60);
 		frames -= mins * fr * 60;
 		secs = frames / fr;
-			
+
 		snprintf (buf, sizeof(buf), _("Disk: %02dh:%02dm:%02ds"), hrs, mins, secs);
 	}
-	
+
 	disk_space_label.set_text (buf);
-	
+
 	// An attempt to make the disk space label flash red when space has run out.
-	
+
 	if (frames < fr * 60 * 5) {
 	/*	disk_space_box.style ("disk_space_label_empty"); */
 	} else {
 	/*	disk_space_box.style ("disk_space_label"); */
 	}
 
-}		  
+}
 
 gint
 ARDOUR_UI::update_wall_clock ()
@@ -991,7 +1026,7 @@ ARDOUR_UI::update_wall_clock ()
 }
 
 gint
-ARDOUR_UI::session_menu (GdkEventButton *ev)
+ARDOUR_UI::session_menu (GdkEventButton */*ev*/)
 {
 	session_popup_menu->popup (0, 0);
 	return TRUE;
@@ -1002,7 +1037,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
 {
 	std::vector<sys::path> session_directories;
 	RecentSessionsSorter cmp;
-	
+
 	recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
 	recent_session_model->clear ();
 
@@ -1016,16 +1051,16 @@ ARDOUR_UI::redisplay_recent_sessions ()
 	//
 	// sort them alphabetically
 	sort (rs.begin(), rs.end(), cmp);
-	
+
 	for (ARDOUR::RecentSessions::iterator i = rs.begin(); i != rs.end(); ++i) {
 	        session_directories.push_back ((*i).second);
 	}
-	
+
 	for (vector<sys::path>::const_iterator i = session_directories.begin();
 			i != session_directories.end(); ++i)
 	{
 		std::vector<sys::path> state_file_paths;
-	    
+
 		// now get available states for this session
 
 		get_state_files_in_directory (*i, state_file_paths);
@@ -1033,7 +1068,7 @@ ARDOUR_UI::redisplay_recent_sessions ()
 		vector<string*>* states;
 		vector<const gchar*> item;
 		string fullpath = (*i).to_string();
-		
+
 		/* remove any trailing / */
 
 		if (fullpath[fullpath.length()-1] == '/') {
@@ -1045,22 +1080,22 @@ ARDOUR_UI::redisplay_recent_sessions ()
 			/* session doesn't exist */
 			cerr << "skipping non-existent session " << fullpath << endl;
 			continue;
-		}		
-		
+		}
+
 		/* now get available states for this session */
 
 		if ((states = Session::possible_states (fullpath)) == 0) {
 			/* no state file? */
 			continue;
 		}
-	  
+
 		std::vector<string> state_file_names(get_file_names_no_extension (state_file_paths));
 
 		Gtk::TreeModel::Row row = *(recent_session_model->append());
 
 		row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
 		row[recent_session_columns.fullpath] = fullpath;
-		
+
 		if (state_file_names.size() > 1) {
 
 			// add the children
@@ -1083,10 +1118,10 @@ ARDOUR_UI::redisplay_recent_sessions ()
 void
 ARDOUR_UI::build_session_selector ()
 {
-	session_selector_window = new ArdourDialog ("session selector");
-	
+	session_selector_window = new ArdourDialog (_("Recent Sessions"));
+
 	Gtk::ScrolledWindow *scroller = manage (new Gtk::ScrolledWindow);
-	
+
 	session_selector_window->add_button (Stock::CANCEL, RESPONSE_CANCEL);
 	session_selector_window->add_button (Stock::OPEN, RESPONSE_ACCEPT);
 	session_selector_window->set_default_response (RESPONSE_ACCEPT);
@@ -1095,7 +1130,7 @@ ARDOUR_UI::build_session_selector ()
 	recent_session_display.append_column (_("Recent Sessions"), recent_session_columns.visible_name);
 	recent_session_display.set_headers_visible (false);
 	recent_session_display.get_selection()->set_mode (SELECTION_BROWSE);
-	recent_session_display.signal_row_activated().connect (mem_fun (*this, &ARDOUR_UI::recent_session_row_activated));
+	recent_session_display.signal_row_activated().connect (sigc::mem_fun (*this, &ARDOUR_UI::recent_session_row_activated));
 
 	scroller->add (recent_session_display);
 	scroller->set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -1110,7 +1145,7 @@ ARDOUR_UI::build_session_selector ()
 }
 
 void
-ARDOUR_UI::recent_session_row_activated (const TreePath& path, TreeViewColumn* col)
+ARDOUR_UI::recent_session_row_activated (const TreePath& /*path*/, TreeViewColumn* /*col*/)
 {
 	session_selector_window->response (RESPONSE_ACCEPT);
 }
@@ -1118,20 +1153,20 @@ ARDOUR_UI::recent_session_row_activated (const TreePath& path, TreeViewColumn* c
 void
 ARDOUR_UI::open_recent_session ()
 {
-	bool can_return = (session != 0);
+	bool can_return = (_session != 0);
 
 	if (session_selector_window == 0) {
 		build_session_selector ();
 	}
-	
+
 	redisplay_recent_sessions ();
 
 	while (true) {
-		
+
 		session_selector_window->set_position (WIN_POS_MOUSE);
 
 		ResponseType r = (ResponseType) session_selector_window->run ();
-		
+
 		switch (r) {
 		case RESPONSE_ACCEPT:
 			break;
@@ -1147,20 +1182,20 @@ ARDOUR_UI::open_recent_session ()
 		if (recent_session_display.get_selection()->count_selected_rows() == 0) {
 			continue;
 		}
-		
+
 		session_selector_window->hide();
 
 		Gtk::TreeModel::iterator i = recent_session_display.get_selection()->get_selected();
-		
+
 		if (i == recent_session_model->children().end()) {
 			return;
 		}
-		
+
 		Glib::ustring path = (*i)[recent_session_columns.fullpath];
 		Glib::ustring state = (*i)[recent_session_columns.visible_name];
-		
+
 		_session_is_new = false;
-		
+
 		if (load_session (path, state) == 0) {
 			break;
 		}
@@ -1191,7 +1226,7 @@ ARDOUR_UI::open_session ()
 {
 	if (!check_audioengine()) {
 		return;
-		
+
 	}
 
 	/* popup selector window */
@@ -1200,7 +1235,7 @@ ARDOUR_UI::open_session ()
 
 		/* ardour sessions are folders */
 
-		open_session_selector = new Gtk::FileChooserDialog (_("open session"), FILE_CHOOSER_ACTION_OPEN);
+		open_session_selector = new Gtk::FileChooserDialog (_("Open Session"), FILE_CHOOSER_ACTION_OPEN);
 		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);
@@ -1238,19 +1273,19 @@ ARDOUR_UI::open_session ()
 
 
 void
-ARDOUR_UI::session_add_midi_route (bool disk, uint32_t how_many)
+ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many)
 {
 	list<boost::shared_ptr<MidiTrack> > tracks;
 
-	if (session == 0) {
+	if (_session == 0) {
 		warning << _("You cannot add a track without a session already loaded.") << endmsg;
 		return;
 	}
 
-	try { 
+	try {
 		if (disk) {
 
-			tracks = session->new_midi_track (ARDOUR::Normal, how_many);
+			tracks = _session->new_midi_track (ARDOUR::Normal, route_group, how_many);
 
 			if (tracks.size() != how_many) {
 				if (how_many == 1) {
@@ -1260,14 +1295,14 @@ ARDOUR_UI::session_add_midi_route (bool disk, uint32_t how_many)
 				}
 			}
 		} /*else {
-			if ((route = session->new_midi_route ()) == 0) {
+			if ((route = _session->new_midi_route ()) == 0) {
 				error << _("could not create new midi bus") << endmsg;
 			}
 		}*/
 	}
 
 	catch (...) {
-		MessageDialog msg (*editor, 
+		MessageDialog msg (*editor,
 				   _("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
 You should save Ardour, exit and\n\
@@ -1278,32 +1313,32 @@ restart JACK with more ports."));
 
 
 void
-ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, uint32_t how_many)
+ARDOUR_UI::session_add_audio_route (bool track, bool aux, int32_t input_channels, int32_t output_channels, ARDOUR::TrackMode mode, RouteGroup* route_group, uint32_t how_many)
 {
 	list<boost::shared_ptr<AudioTrack> > tracks;
 	RouteList routes;
 
-	if (session == 0) {
+	if (_session == 0) {
 		warning << _("You cannot add a track or bus without a session already loaded.") << endmsg;
 		return;
 	}
 
-	try { 
+	try {
 		if (track) {
-			tracks = session->new_audio_track (input_channels, output_channels, mode, how_many);
+			tracks = _session->new_audio_track (input_channels, output_channels, mode, route_group, how_many);
 
 			if (tracks.size() != how_many) {
 				if (how_many == 1) {
 					error << _("could not create a new audio track") << endmsg;
 				} else {
-					error << string_compose (_("could only create %1 of %2 new audio %3"), 
+					error << string_compose (_("could only create %1 of %2 new audio %3"),
 								 tracks.size(), how_many, (track ? _("tracks") : _("busses"))) << endmsg;
 				}
 			}
 
 		} else {
 
-			routes = session->new_audio_route (input_channels, output_channels, how_many);
+			routes = _session->new_audio_route (aux, input_channels, output_channels, route_group, how_many);
 
 			if (routes.size() != how_many) {
 				if (how_many == 1) {
@@ -1313,14 +1348,14 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
 				}
 			}
 		}
-		
+
 #if CONTROLOUTS
 		if (need_control_room_outs) {
 			pan_t pans[2];
-			
+
 			pans[0] = 0.5;
 			pans[1] = 0.5;
-			
+
 			route->set_stereo_control_outs (control_lr_channels);
 			route->control_outs()->set_stereo_pan (pans, this);
 		}
@@ -1328,7 +1363,7 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
 	}
 
 	catch (...) {
-		MessageDialog msg (*editor, 
+		MessageDialog msg (*editor,
 				   _("There are insufficient JACK ports available\n\
 to create a new track or bus.\n\
 You should save Ardour, exit and\n\
@@ -1343,9 +1378,9 @@ ARDOUR_UI::do_transport_locate (nframes_t new_position)
 {
 	nframes_t _preroll = 0;
 
-	if (session) {
+	if (_session) {
 		// XXX CONFIG_CHANGE FIX - requires AnyTime handling
-		// _preroll = session->convert_to_frames_at (new_position, Config->get_preroll());
+		// _preroll = _session->convert_to_frames_at (new_position, Config->get_preroll());
 
 		if (new_position > _preroll) {
 			new_position -= _preroll;
@@ -1353,23 +1388,22 @@ ARDOUR_UI::do_transport_locate (nframes_t new_position)
 			new_position = 0;
 		}
 
-		session->request_locate (new_position);
+		_session->request_locate (new_position);
 	}
 }
 
 void
-ARDOUR_UI::transport_goto_start ()  
+ARDOUR_UI::transport_goto_start ()
 {
-	if (session) {
-		session->goto_start();
+	if (_session) {
+		_session->goto_start();
 
-		
 		/* force displayed area in editor to start no matter
 		   what "follow playhead" setting is.
 		*/
-		
+
 		if (editor) {
-			editor->reset_x_origin (session->current_start_frame());
+			editor->center_screen (_session->current_start_frame ());
 		}
 	}
 }
@@ -1377,14 +1411,14 @@ ARDOUR_UI::transport_goto_start ()
 void
 ARDOUR_UI::transport_goto_zero ()
 {
-	if (session) {
-		session->request_locate (0);
+	if (_session) {
+		_session->request_locate (0);
+
 
-		
 		/* force displayed area in editor to start no matter
 		   what "follow playhead" setting is.
 		*/
-		
+
 		if (editor) {
 			editor->reset_x_origin (0);
 		}
@@ -1394,27 +1428,27 @@ ARDOUR_UI::transport_goto_zero ()
 void
 ARDOUR_UI::transport_goto_wallclock ()
 {
-	if (session && editor) {
+	if (_session && editor) {
 
 		time_t now;
 		struct tm tmnow;
 		nframes64_t frames;
-		
+
 		time (&now);
 		localtime_r (&now, &tmnow);
-	
-		frames = tmnow.tm_hour * (60 * 60 * session->frame_rate());
-		frames += tmnow.tm_min * (60 * session->frame_rate());
-		frames += tmnow.tm_sec * session->frame_rate();
 
-		session->request_locate (frames);
+		frames = tmnow.tm_hour * (60 * 60 * _session->frame_rate());
+		frames += tmnow.tm_min * (60 * _session->frame_rate());
+		frames += tmnow.tm_sec * _session->frame_rate();
+
+		_session->request_locate (frames);
 
 		/* force displayed area in editor to start no matter
 		   what "follow playhead" setting is.
 		*/
-		
+
 		if (editor) {
-			editor->reset_x_origin (frames - (editor->current_page_frames()/2));
+			editor->center_screen (frames);
 		}
 	}
 }
@@ -1422,16 +1456,16 @@ ARDOUR_UI::transport_goto_wallclock ()
 void
 ARDOUR_UI::transport_goto_end ()
 {
-	if (session) {
-		nframes_t frame = session->current_end_frame();
-		session->request_locate (frame);
+	if (_session) {
+		nframes_t const frame = _session->current_end_frame();
+		_session->request_locate (frame);
 
 		/* force displayed area in editor to start no matter
 		   what "follow playhead" setting is.
 		*/
-		
+
 		if (editor) {
-			editor->reset_x_origin (frame);
+			editor->center_screen (frame);
 		}
 	}
 }
@@ -1439,27 +1473,23 @@ ARDOUR_UI::transport_goto_end ()
 void
 ARDOUR_UI::transport_stop ()
 {
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
-	if (session->is_auditioning()) {
-		session->cancel_audition ();
+	if (_session->is_auditioning()) {
+		_session->cancel_audition ();
 		return;
 	}
-	
-	if (session->get_play_loop ()) {
-		session->request_play_loop (false);
-	}
-	
-	session->request_stop ();
+
+	_session->request_stop ();
 }
 
 void
 ARDOUR_UI::transport_stop_and_forget_capture ()
 {
-	if (session) {
-		session->request_stop (true);
+	if (_session) {
+		_session->request_stop (true);
 	}
 }
 
@@ -1474,76 +1504,146 @@ ARDOUR_UI::remove_last_capture()
 void
 ARDOUR_UI::transport_record (bool roll)
 {
-	
-	if (session) {
-		switch (session->record_status()) {
+
+	if (_session) {
+		switch (_session->record_status()) {
 		case Session::Disabled:
-			if (session->ntracks() == 0) {
+			if (_session->ntracks() == 0) {
 				MessageDialog msg (*editor, _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu."));
 				msg.run ();
 				return;
 			}
-			session->maybe_enable_record ();
+			_session->maybe_enable_record ();
 			if (roll) {
 				transport_roll ();
 			}
 			break;
 		case Session::Recording:
 			if (roll) {
-				session->request_stop();
+				_session->request_stop();
 			} else {
-				session->disable_record (false, true);
+				_session->disable_record (false, true);
 			}
 			break;
 
 		case Session::Enabled:
-			session->disable_record (false, true);
+			_session->disable_record (false, true);
 		}
 	}
-	//cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " session->record_status() = " << session->record_status() << endl;
+	//cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
 }
 
-void
+void 
 ARDOUR_UI::transport_roll ()
 {
-	bool rolling;
+	if (!_session) {
+		return;
+	}
+
+	if (_session->is_auditioning()) {
+		return;
+	}
+	
+	if (_session->config.get_external_sync()) {
+		switch (_session->config.get_sync_source()) {
+		case JACK:
+			break;
+		default:
+			/* transport controlled by the master */
+			return;
+		}
+	}
+
+	bool rolling = _session->transport_rolling();
+
+	if (_session->get_play_loop()) {
+		_session->request_play_loop (false, true);
+	} else if (_session->get_play_range ()) {
+		_session->request_play_range (false, true);
+	} 
+
+	if (!rolling) {
+		_session->request_transport_speed (1.0f);
+	}
+
+	map_transport_state ();
+}
+
+void
+ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
+{
+	
+	if (!_session) {
+		return;
+	}
 
-	if (!session) {
+	if (_session->is_auditioning()) {
+		_session->cancel_audition ();
 		return;
 	}
+	
+	if (_session->config.get_external_sync()) {
+		switch (_session->config.get_sync_source()) {
+		case JACK:
+			break;
+		default:
+			/* transport controlled by the master */
+			return;
+		}
+	}
 
-	rolling = session->transport_rolling ();
+	bool rolling = _session->transport_rolling();
+	bool affect_transport = true;
 
-	//cerr << "ARDOUR_UI::transport_roll () called session->record_status() = " << session->record_status() << endl;
+	if (rolling && roll_out_of_bounded_mode) {
+		/* drop out of loop/range playback but leave transport rolling */
+		if (_session->get_play_loop()) {
+			if (Config->get_seamless_loop()) {
+				/* the disk buffers contain copies of the loop - we can't 
+				   just keep playing, so stop the transport. the user
+				   can restart as they wish.
+				*/
+				affect_transport = true;
+			} else {
+				/* disk buffers are normal, so we can keep playing */
+				affect_transport = false;
+			}
+			_session->request_play_loop (false, true);
+		} else if (_session->get_play_range ()) {
+			affect_transport = false;
+			_session->request_play_range (0, true);
+		} 
+	} 
 
-	if (session->get_play_loop()) {
-		session->request_play_loop (false);
-		auto_loop_button.set_visual_state (1);
-		roll_button.set_visual_state (1);
-	} else if (session->get_play_range ()) {
-		session->request_play_range (false);
-		play_selection_button.set_visual_state (0);
-	} else if (rolling) {
-		session->request_locate (session->last_transport_start(), true);
+	if (affect_transport) {
+		if (rolling) {
+			_session->request_stop (with_abort, true);
+		} else {
+			_session->request_transport_speed (1.0f);
+		}
 	}
 
-	session->request_transport_speed (1.0f);
+	map_transport_state ();	
 }
 
 void
-ARDOUR_UI::transport_loop()
+ARDOUR_UI::toggle_session_auto_loop ()
 {
-	if (session) {
-		if (session->get_play_loop()) {
-			if (session->transport_rolling()) {
-				Location * looploc = session->locations()->auto_loop_location();
+	if (_session) {
+		if (_session->get_play_loop()) {
+			if (_session->transport_rolling()) {
+				Location * looploc = _session->locations()->auto_loop_location();
 				if (looploc) {
-					session->request_locate (looploc->start(), true);
+					_session->request_locate (looploc->start(), true);
 				}
+			} else {
+				_session->request_play_loop (false);
+			}
+		} else {
+			Location * looploc = _session->locations()->auto_loop_location();
+			if (looploc) {
+				_session->request_play_loop (true);
 			}
-		}
-		else {
-			session->request_play_loop (true);
 		}
 	}
 }
@@ -1551,14 +1651,10 @@ ARDOUR_UI::transport_loop()
 void
 ARDOUR_UI::transport_play_selection ()
 {
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
-	if (!session->get_play_range()) {
-		session->request_stop ();
-	}
-
 	editor->play_selection ();
 }
 
@@ -1566,25 +1662,25 @@ void
 ARDOUR_UI::transport_rewind (int option)
 {
 	float current_transport_speed;
- 
-       	if (session) {
-		current_transport_speed = session->transport_speed();
-		
+
+       	if (_session) {
+		current_transport_speed = _session->transport_speed();
+
 		if (current_transport_speed >= 0.0f) {
 			switch (option) {
 			case 0:
-				session->request_transport_speed (-1.0f);
+				_session->request_transport_speed (-1.0f);
 				break;
 			case 1:
-				session->request_transport_speed (-4.0f);
+				_session->request_transport_speed (-4.0f);
 				break;
 			case -1:
-				session->request_transport_speed (-0.5f);
+				_session->request_transport_speed (-0.5f);
 				break;
 			}
 		} else {
 			/* speed up */
-			session->request_transport_speed (current_transport_speed * 1.5f);
+			_session->request_transport_speed (current_transport_speed * 1.5f);
 		}
 	}
 }
@@ -1593,39 +1689,40 @@ void
 ARDOUR_UI::transport_forward (int option)
 {
 	float current_transport_speed;
-	
-	if (session) {
-		current_transport_speed = session->transport_speed();
-		
+
+	if (_session) {
+		current_transport_speed = _session->transport_speed();
+
 		if (current_transport_speed <= 0.0f) {
 			switch (option) {
 			case 0:
-				session->request_transport_speed (1.0f);
+				_session->request_transport_speed (1.0f);
 				break;
 			case 1:
-				session->request_transport_speed (4.0f);
+				_session->request_transport_speed (4.0f);
 				break;
 			case -1:
-				session->request_transport_speed (0.5f);
+				_session->request_transport_speed (0.5f);
 				break;
 			}
 		} else {
 			/* speed up */
-			session->request_transport_speed (current_transport_speed * 1.5f);
+			_session->request_transport_speed (current_transport_speed * 1.5f);
 		}
+
 	}
 }
 
 void
 ARDOUR_UI::toggle_record_enable (uint32_t dstream)
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 
 	boost::shared_ptr<Route> r;
-	
-	if ((r = session->route_by_remote_id (dstream)) != 0) {
+
+	if ((r = _session->route_by_remote_id (dstream)) != 0) {
 
 		Track* t;
 
@@ -1633,37 +1730,72 @@ ARDOUR_UI::toggle_record_enable (uint32_t dstream)
 			t->diskstream()->set_record_enabled (!t->diskstream()->record_enabled());
 		}
 	}
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
 }
 
-void
-ARDOUR_UI::queue_transport_change ()
-{
-	Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &ARDOUR_UI::map_transport_state));
-}
-
 void
 ARDOUR_UI::map_transport_state ()
 {
-	float sp = session->transport_speed();
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::map_transport_state)
+
+	if (!_session) {
+		auto_loop_button.set_visual_state (0);
+		play_selection_button.set_visual_state (0);
+		roll_button.set_visual_state (0);
+		stop_button.set_visual_state (1);
+		return;
+	}
+
+	float sp = _session->transport_speed();
 
 	if (sp == 1.0f) {
-		transport_rolling ();
-	} else if (sp < 0.0f) {
-		transport_rewinding ();
-	} else if (sp > 0.0f) {
-		transport_forwarding ();
+		shuttle_fract = SHUTTLE_FRACT_SPEED1;  /* speed = 1.0, believe it or not */
+		shuttle_box.queue_draw ();
+	} else if (sp == 0.0f) {
+		shuttle_fract = 0;
+		shuttle_box.queue_draw ();
+		update_disk_space ();
+	}
+
+	if (sp != 0.0) {
+
+		if (_session->get_play_range()) {
+
+			play_selection_button.set_visual_state (1);
+			roll_button.set_visual_state (0);
+			auto_loop_button.set_visual_state (0);
+			
+		} else if (_session->get_play_loop ()) {
+			
+			auto_loop_button.set_visual_state (1);
+			play_selection_button.set_visual_state (0);
+			roll_button.set_visual_state (0);
+
+		} else {
+			
+			roll_button.set_visual_state (1);
+			play_selection_button.set_visual_state (0);
+			auto_loop_button.set_visual_state (0);
+		}
+
+		stop_button.set_visual_state (0);
+
 	} else {
-		transport_stopped ();
+
+		stop_button.set_visual_state (1);
+		roll_button.set_visual_state (0);
+		play_selection_button.set_visual_state (0);
+		auto_loop_button.set_visual_state (0);
 	}
+
 }
 
 void
 ARDOUR_UI::engine_stopped ()
 {
-	ENSURE_GUI_THREAD (mem_fun(*this, &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);
 }
@@ -1671,7 +1803,7 @@ ARDOUR_UI::engine_stopped ()
 void
 ARDOUR_UI::engine_running ()
 {
-	ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_running));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_running)
 	ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true);
 	ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false);
 
@@ -1711,7 +1843,7 @@ ARDOUR_UI::engine_running ()
 	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 ();
@@ -1722,14 +1854,14 @@ ARDOUR_UI::engine_running ()
 void
 ARDOUR_UI::engine_halted ()
 {
-	ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::engine_halted));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_halted)
 
 	ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, false);
 	ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, true);
 
 	update_sample_rate (0);
 
-	MessageDialog msg (*editor, 
+	MessageDialog msg (*editor,
 			   _("\
 JACK has either been shutdown or it\n\
 disconnected Ardour because Ardour\n\
@@ -1742,7 +1874,7 @@ JACK, reconnect and save the session."));
 int32_t
 ARDOUR_UI::do_engine_start ()
 {
-	try { 
+	try {
 		engine->start();
 	}
 
@@ -1753,7 +1885,7 @@ ARDOUR_UI::do_engine_start ()
 		unload_session ();
 		return -2;
 	}
-	
+
 	return 0;
 }
 
@@ -1767,14 +1899,14 @@ void
 ARDOUR_UI::update_clocks ()
 {
 	if (!editor || !editor->dragging_playhead()) {
-		Clock (session->audible_frame(), false, editor->get_preferred_edit_position()); /* EMIT_SIGNAL */
+		Clock (_session->audible_frame(), false, editor->get_preferred_edit_position()); /* EMIT_SIGNAL */
 	}
 }
 
 void
 ARDOUR_UI::start_clocking ()
 {
-	clock_signal_connection = RapidScreenUpdate.connect (mem_fun(*this, &ARDOUR_UI::update_clocks));
+	clock_signal_connection = RapidScreenUpdate.connect (sigc::mem_fun(*this, &ARDOUR_UI::update_clocks));
 }
 
 void
@@ -1782,7 +1914,7 @@ ARDOUR_UI::stop_clocking ()
 {
 	clock_signal_connection.disconnect ();
 }
-	
+
 void
 ARDOUR_UI::toggle_clocking ()
 {
@@ -1817,7 +1949,7 @@ ARDOUR_UI::start_blinking ()
 	*/
 
 	if (blink_timeout_tag < 0) {
-		blink_on = false;	
+		blink_on = false;
 		blink_timeout_tag = g_timeout_add (240, _blink, this);
 	}
 }
@@ -1831,44 +1963,6 @@ ARDOUR_UI::stop_blinking ()
 	}
 }
 
-void
-ARDOUR_UI::name_io_setup (AudioEngine& engine, 
-			  string& buf,
-			  IO& io,
-			  bool in)
-{
-	vector<string> connections;
-
-	if (in) {
-		if (io.n_inputs().n_total() == 0) {
-			buf = _("none");
-			return;
-		}
-		
-		/* XXX we're not handling multiple ports yet. */
-
-		if (io.input(0)->get_connections(connections) == 0) {
-			buf = _("off");
-		} else {
-			buf = connections.front();
-		}
-
-	} else {
-
-		if (io.n_outputs().n_total() == 0) {
-			buf = _("none");
-			return;
-		}
-		
-		/* XXX we're not handling multiple ports yet. */
-
-		if (io.output(0)->get_connections(connections) == 0) {
-			buf = _("off");
-		} else {
-			buf = connections.front();
-		}
-	}
-}
 
 /** Ask the user for the name of a new shapshot and then take it.
  */
@@ -1887,16 +1981,39 @@ ARDOUR_UI::snapshot_session ()
 
 	prompter.set_name ("Prompter");
 	prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+	prompter.set_title (_("Take Snapshot"));
 	prompter.set_prompt (_("Name of New Snapshot"));
 	prompter.set_initial_text (timebuf);
-	
+
 	switch (prompter.run()) {
 	case RESPONSE_ACCEPT:
+	{
 		prompter.get_result (snapname);
-		if (snapname.length()){
+
+		bool do_save = (snapname.length() != 0);
+
+		vector<sys::path> p;
+		get_state_files_in_directory (_session->session_directory().root_path(), p);
+		vector<string> n = get_file_names_no_extension (p);
+		if (find (n.begin(), n.end(), snapname) != n.end()) {
+
+			ArdourDialog confirm (_("Confirm snapshot overwrite"), true);
+			Label m (_("A snapshot already exists with that name.  Do you want to overwrite it?"));
+			confirm.get_vbox()->pack_start (m, true, true);
+			confirm.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+			confirm.add_button (_("Overwrite"), Gtk::RESPONSE_ACCEPT);
+			confirm.show_all ();
+			switch (confirm.run()) {
+			case RESPONSE_CANCEL:
+				do_save = false;
+			}
+		}
+
+		if (do_save) {
 			save_state (snapname);
 		}
 		break;
+	}
 
 	default:
 		break;
@@ -1908,18 +2025,18 @@ ARDOUR_UI::save_state (const string & name)
 {
 	(void) save_state_canfail (name);
 }
-		
+
 int
 ARDOUR_UI::save_state_canfail (string name)
 {
-	if (session) {
+	if (_session) {
 		int ret;
 
 		if (name.length() == 0) {
-			name = session->snap_name();
+			name = _session->snap_name();
 		}
 
-		if ((ret = session->save_state (name)) != 0) {
+		if ((ret = _session->save_state (name)) != 0) {
 			return ret;
 		}
 	}
@@ -1930,56 +2047,52 @@ ARDOUR_UI::save_state_canfail (string name)
 void
 ARDOUR_UI::primary_clock_value_changed ()
 {
-	if (session) {
-		session->request_locate (primary_clock.current_time ());
+	if (_session) {
+		_session->request_locate (primary_clock.current_time ());
 	}
 }
 
 void
 ARDOUR_UI::big_clock_value_changed ()
 {
-	if (session) {
-		session->request_locate (big_clock.current_time ());
+	if (_session) {
+		_session->request_locate (big_clock.current_time ());
 	}
 }
 
 void
 ARDOUR_UI::secondary_clock_value_changed ()
 {
-	if (session) {
-		session->request_locate (secondary_clock.current_time ());
+	if (_session) {
+		_session->request_locate (secondary_clock.current_time ());
 	}
 }
 
 void
-ARDOUR_UI::transport_rec_enable_blink (bool onoff) 
+ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 {
-	if (session == 0) {
+	if (_session == 0) {
 		return;
 	}
-	
-	switch (session->record_status()) {
-	case Session::Enabled:
+
+	Session::RecordState const r = _session->record_status ();
+	bool const h = _session->have_rec_enabled_diskstream ();
+
+	if (r == Session::Enabled || (r == Session::Recording && !h)) {
 		if (onoff) {
 			rec_button.set_visual_state (2);
 		} else {
 			rec_button.set_visual_state (0);
 		}
-		break;
-
-	case Session::Recording:
+	} else if (r == Session::Recording && h) {
 		rec_button.set_visual_state (1);
-		break;
-
-	default:
+	} else {
 		rec_button.set_visual_state (0);
-		break;
 	}
 }
 
 void
 ARDOUR_UI::save_template ()
-
 {
 	ArdourPrompter prompter (true);
 	string name;
@@ -1989,16 +2102,17 @@ ARDOUR_UI::save_template ()
 	}
 
 	prompter.set_name (X_("Prompter"));
+	prompter.set_title (_("Save Mix Template"));
 	prompter.set_prompt (_("Name for mix template:"));
-	prompter.set_initial_text(session->name() + _("-template"));
+	prompter.set_initial_text(_session->name() + _("-template"));
 	prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
 
 	switch (prompter.run()) {
 	case RESPONSE_ACCEPT:
 		prompter.get_result (name);
-		
+
 		if (name.length()) {
-			session->save_template (name);
+			_session->save_template (name);
 		}
 		break;
 
@@ -2011,7 +2125,7 @@ void
 ARDOUR_UI::edit_metadata ()
 {
 	SessionMetadataEditor dialog;
-	dialog.set_session (session);
+	dialog.set_session (_session);
 	editor->ensure_float (dialog);
 	dialog.run ();
 }
@@ -2020,7 +2134,7 @@ void
 ARDOUR_UI::import_metadata ()
 {
 	SessionMetadataImporter dialog;
-	dialog.set_session (session);
+	dialog.set_session (_session);
 	editor->ensure_float (dialog);
 	dialog.run ();
 }
@@ -2029,12 +2143,12 @@ void
 ARDOUR_UI::fontconfig_dialog ()
 {
 #ifdef GTKOSX
-	/* X11 users will always have fontconfig info around, but new GTK-OSX users 
+	/* X11 users will always have fontconfig info around, but new GTK-OSX users
 	   may not and it can take a while to build it. Warn them.
 	*/
-	
+
 	Glib::ustring fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
-	
+
 	if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
 		MessageDialog msg (*_startup,
 				   _("Welcome to Ardour.\n\n"
@@ -2068,7 +2182,7 @@ ARDOUR_UI::parse_cmdline_path (const Glib::ustring& cmdline_path, Glib::ustring&
 		/* it doesn't exist, assume the best */
 		session_path = Glib::path_get_dirname (string (cmdline_path));
 	}
-	
+
 	session_name = basename_nosuffix (string (cmdline_path));
 }
 
@@ -2086,22 +2200,22 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
 	if (session_name.length() == 0 || session_path.length() == 0) {
 		return false;
 	}
-	
+
 	if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) {
 
 		Glib::ustring predicted_session_file;
-		
+
 		predicted_session_file = session_path;
 		predicted_session_file += '/';
 		predicted_session_file += session_name;
 		predicted_session_file += ARDOUR::statefile_suffix;
-		
+
 		if (Glib::file_test (predicted_session_file, Glib::FILE_TEST_EXISTS)) {
 			existing_session = true;
 		}
-		
+
 	} else if (Glib::file_test (session_path, Glib::FILE_TEST_EXISTS)) {
-		
+
 		if (session_path.find (ARDOUR::statefile_suffix) == session_path.length() - 7) {
 			/* existing .ardour file */
 			existing_session = true;
@@ -2110,14 +2224,14 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
 	} else {
 		existing_session = false;
 	}
-	
+
 	/* lets just try to load it */
-	
+
 	if (create_engine ()) {
 		backend_audio_error (false, _startup);
 		return -1;
 	}
-	
+
 	return load_session (session_path, session_name);
 }
 
@@ -2125,15 +2239,16 @@ bool
 ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path)
 {
 	Glib::ustring str = string_compose (_("This session\n%1\nalready exists. Do you want to open it?"), session_path);
-	
+
 	MessageDialog msg (str,
 			   false,
 			   Gtk::MESSAGE_WARNING,
 			   Gtk::BUTTONS_YES_NO,
 			   true);
-	
-	
-	msg.set_name (X_("CleanupDialog"));
+
+
+	msg.set_name (X_("OpenExistingDialog"));
+	msg.set_title (_("Open Existing Session"));
 	msg.set_wmclass (X_("existing_session"), "Ardour");
 	msg.set_position (Gtk::WIN_POS_MOUSE);
 	pop_back_splash ();
@@ -2149,59 +2264,61 @@ ARDOUR_UI::ask_about_loading_existing_session (const Glib::ustring& session_path
 int
 ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib::ustring& session_name)
 {
-	
+
 	uint32_t cchns;
 	uint32_t mchns;
 	AutoConnectOption iconnect;
 	AutoConnectOption oconnect;
 	uint32_t nphysin;
 	uint32_t nphysout;
-	
+
 	if (Profile->get_sae()) {
-		
+
 		cchns = 0;
 		mchns = 2;
 		iconnect = AutoConnectPhysical;
 		oconnect = AutoConnectMaster;
 		nphysin = 0; // use all available
 		nphysout = 0; // use all available
-		
+
 	} else {
-		
+
 		/* get settings from advanced section of NSD */
-		
+
 		if (_startup->create_control_bus()) {
 			cchns = (uint32_t) _startup->control_channel_count();
 		} else {
 			cchns = 0;
 		}
-		
+
 		if (_startup->create_master_bus()) {
 			mchns = (uint32_t) _startup->master_channel_count();
 		} else {
 			mchns = 0;
 		}
-		
+
 		if (_startup->connect_inputs()) {
 			iconnect = AutoConnectPhysical;
 		} else {
 			iconnect = AutoConnectOption (0);
 		}
-		
+
 		/// @todo some minor tweaks.
-		
-		if (_startup->connect_outs_to_master()) {
-			oconnect = AutoConnectMaster;
-		} else if (_startup->connect_outs_to_physical()) {
-			oconnect = AutoConnectPhysical;
-		} else {
-			oconnect = AutoConnectOption (0);
-		} 
-		
+
+		oconnect = AutoConnectOption (0);
+
+		if (_startup->connect_outputs ()) {
+			if (_startup->connect_outs_to_master()) {
+				oconnect = AutoConnectMaster;
+			} else if (_startup->connect_outs_to_physical()) {
+				oconnect = AutoConnectPhysical;
+			}
+		}
+
 		nphysin = (uint32_t) _startup->input_limit_count();
 		nphysout = (uint32_t) _startup->output_limit_count();
 	}
-	
+
 	if (build_session (session_path,
 			   session_name,
 			   cchns,
@@ -2209,15 +2326,50 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 			   iconnect,
 			   oconnect,
 			   nphysin,
-			   nphysout, 
+			   nphysout,
 			   engine->frame_rate() * 60 * 5)) {
-		
+
 		return -1;
 	}
 
 	return 0;
 }
 
+void
+ARDOUR_UI::idle_load (const Glib::ustring& path)
+{
+	if (_session) {
+		if (Glib::file_test (path, Glib::FILE_TEST_IS_DIR)) {
+			/* /path/to/foo => /path/to/foo, foo */
+			load_session (path, basename_nosuffix (path));
+		} else {
+			/* /path/to/foo/foo.ardour => /path/to/foo, foo */
+			load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
+		}
+	} else {
+
+		ARDOUR_COMMAND_LINE::session_name = path;
+
+		/*
+		 * new_session_dialog doens't exist in A3
+		 * Try to remove all references to it to
+		 * see if it will compile.  NOTE: this will
+		 * likely cause a runtime issue is my somewhat
+		 * uneducated guess.
+		 */
+
+		//if (new_session_dialog) {
+
+
+			/* make it break out of Dialog::run() and
+			   start again.
+			 */
+
+			//new_session_dialog->response (1);
+		//}
+	}
+}
+
 void
 ARDOUR_UI::end_loading_messages ()
 {
@@ -2225,15 +2377,16 @@ ARDOUR_UI::end_loading_messages ()
 }
 
 void
-ARDOUR_UI::loading_message (const std::string& msg)
+ARDOUR_UI::loading_message (const std::string& /*msg*/)
 {
 	// show_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 */
 int
-ARDOUR_UI::get_session_parameters (bool should_be_new)
+ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new)
 {
 	Glib::ustring session_name;
 	Glib::ustring session_path;
@@ -2245,7 +2398,7 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
 
 		if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
 
-			/* if they named a specific statefile, use it, otherwise they are 
+			/* if they named a specific statefile, use it, otherwise they are
 			   just giving a session folder, and we want to use it as is
 			   to find the session.
 			*/
@@ -2260,34 +2413,40 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
 
 		} else {
 
-			run_startup (should_be_new);
-			
+			bool const apply = run_startup (should_be_new);
+			if (!apply) {
+				if (quit_on_cancel) {
+					exit (1);
+				} else {
+					return ret;
+				}
+			}
+
 			/* if we run the startup dialog again, offer more than just "new session" */
-			
+
 			should_be_new = false;
-			
+
 			session_name = _startup->session_name (likely_new);
-			
+
 			/* this shouldn't happen, but we catch it just in case it does */
-			
+
 			if (session_name.empty()) {
 				break;
-			} 
+			}
 			if (_startup->use_session_template()) {
 				template_name = _startup->session_template_name();
 				_session_is_new = true;
-			} 
-
+			}
 
-			if (session_name[0] == '/' || 
+			if (session_name[0] == '/' ||
 			    (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == '/') ||
 			    (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == '/')) {
-				
+
 				session_path = Glib::path_get_dirname (session_name);
 				session_name = Glib::path_get_basename (session_name);
-				
+
 			} else {
-				
+
 				session_path = _startup->session_folder();
 			}
 		}
@@ -2295,18 +2454,18 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
 		if (create_engine ()) {
 			break;
 		}
-		
+
 		if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
 			if (likely_new) {
 
-				ustring existing = Glib::build_filename (session_path, session_name);
-				
+				Glib::ustring existing = Glib::build_filename (session_path, session_name);
+
 				if (!ask_about_loading_existing_session (existing)) {
 					ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
 					continue;
-				} 
-			} 
+				}
+			}
 
 			_session_is_new = false;
 
@@ -2323,17 +2482,21 @@ ARDOUR_UI::get_session_parameters (bool should_be_new)
 		}
 
 		if (likely_new && template_name.empty()) {
-			
+
 			ret = build_session_from_nsd (session_path, session_name);
 
 		} else {
 
 			ret = load_session (session_path, session_name, template_name);
+			if (!ARDOUR_COMMAND_LINE::immediate_save.empty()) {
+				_session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
+				exit (1);
+			}
 		}
 	}
-	
+
 	return ret;
-}	
+}
 
 void
 ARDOUR_UI::close_session()
@@ -2344,7 +2507,8 @@ ARDOUR_UI::close_session()
 
 	unload_session (true);
 
-	get_session_parameters (false);
+	ARDOUR_COMMAND_LINE::session_name = "";
+	get_session_parameters (true, false);
 }
 
 int
@@ -2369,16 +2533,6 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 		goto out;
 	}
 
-	/* if it already exists, we must have write access */
-
-	if (Glib::file_test (path.c_str(), Glib::FILE_TEST_EXISTS) && ::access (path.c_str(), W_OK)) {
-		MessageDialog msg (*editor, _("You do not have write access to this session.\n"
-					      "This prevents the session from being loaded."));
-		pop_back_splash ();
-		msg.run ();
-		goto out;
-	}
-
 	loading_message (_("Please wait while Ardour loads your session"));
 
 	try {
@@ -2393,7 +2547,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 				   true,
 				   Gtk::MESSAGE_INFO,
 				   Gtk::BUTTONS_CLOSE);
-		
+
 		msg.set_title (_("Port Registration Error"));
 		msg.set_secondary_text (_("Click the Close button to try again."));
 		msg.set_position (Gtk::WIN_POS_CENTER);
@@ -2419,7 +2573,7 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 				   true,
 				   Gtk::MESSAGE_INFO,
 				   Gtk::BUTTONS_CLOSE);
-		
+
 		msg.set_title (_("Loading Error"));
 		msg.set_secondary_text (_("Click the Close button to try again."));
 		msg.set_position (Gtk::WIN_POS_CENTER);
@@ -2439,16 +2593,14 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 		goto out;
 	}
 
-	connect_to_session (new_session);
-
-	Config->set_current_owner (ConfigVariableBase::Interface);
+	set_session (new_session);
 
 	session_loaded = true;
-	
+
 	goto_editor_window ();
 
-	if (session) {
-		session->set_clean ();
+	if (_session) {
+		_session->set_clean ();
 	}
 
 	flush_pending ();
@@ -2459,9 +2611,9 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 }
 
 int
-ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name, 
+ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_name,
 			  uint32_t control_channels,
-			  uint32_t master_channels, 
+			  uint32_t master_channels,
 			  AutoConnectOption input_connect,
 			  AutoConnectOption output_connect,
 			  uint32_t nphysin,
@@ -2484,7 +2636,7 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
 	} else if (x > 0) {
 		return 0;
 	}
-	
+
 	_session_is_new = true;
 
 	try {
@@ -2500,7 +2652,7 @@ ARDOUR_UI::build_session (const Glib::ustring& path, const Glib::ustring& snap_n
 		return -1;
 	}
 
-	connect_to_session (new_session);
+	set_session (new_session);
 
 	session_loaded = true;
 
@@ -2514,7 +2666,7 @@ ARDOUR_UI::show ()
 {
 	if (editor) {
 		editor->show_window ();
-		
+
 		if (!shown_flag) {
 			editor->present ();
 		}
@@ -2528,7 +2680,7 @@ ARDOUR_UI::show_about ()
 {
 	if (about == 0) {
 		about = new About;
-		about->signal_response().connect(mem_fun (*this, &ARDOUR_UI::about_signal_response) );
+		about->signal_response().connect(sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response) );
 	}
 
 	about->show_all ();
@@ -2544,7 +2696,7 @@ ARDOUR_UI::hide_about ()
 }
 
 void
-ARDOUR_UI::about_signal_response(int response)
+ARDOUR_UI::about_signal_response (int /*response*/)
 {
 	hide_about();
 }
@@ -2576,7 +2728,8 @@ ARDOUR_UI::hide_splash ()
 }
 
 void
-ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* list_title, const string & msg)
+ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title,
+				    const string& plural_msg, const string& singular_msg)
 {
 	size_t removed;
 
@@ -2584,7 +2737,7 @@ ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* l
 
 	if (removed == 0) {
 		MessageDialog msgd (*editor,
-				    _("No audio files were ready for cleanup"), 
+				    _("No audio files were ready for cleanup"),
 				    true,
 				    Gtk::MESSAGE_INFO,
 				    (Gtk::ButtonsType)(Gtk::BUTTONS_OK)  );
@@ -2592,15 +2745,15 @@ ARDOUR_UI::display_cleanup_results (Session::cleanup_report& rep, const gchar* l
 check for any existing snapshots.\n\
 These may still include regions that\n\
 require some unused files to continue to exist."));
-	
+
 		msgd.run ();
 		return;
-	} 
+	}
 
 	ArdourDialog results (_("ardour: cleanup"), true, false);
-	
+
 	struct CleanupResultsModelColumns : public Gtk::TreeModel::ColumnRecord {
-	    CleanupResultsModelColumns() { 
+	    CleanupResultsModelColumns() {
 		    add (visible_name);
 		    add (fullpath);
 	    }
@@ -2608,11 +2761,11 @@ require some unused files to continue to exist."));
 	    Gtk::TreeModelColumn<Glib::ustring> fullpath;
 	};
 
-	
+
 	CleanupResultsModelColumns results_columns;
 	Glib::RefPtr<Gtk::ListStore> results_model;
 	Gtk::TreeView results_display;
-	
+
 	results_model = ListStore::create (results_columns);
 	results_display.set_model (results_model);
 	results_display.append_column (list_title, results_columns.visible_name);
@@ -2631,20 +2784,32 @@ require some unused files to continue to exist."));
 
 	dimage->set_alignment(ALIGN_LEFT, ALIGN_TOP);
 
-	const string dead_sound_directory = session->session_directory().dead_sound_path().to_string();
+	const string dead_sound_directory = _session->session_directory().dead_sound_path().to_string();
+
+
+
+
+	/* subst:
+	   %1 - number of files removed
+	   %2 - location of "dead_sounds"
+	   %3 - size of files affected
+	   %4 - prefix for "bytes" to produce sensible results (e.g. mega, kilo, giga)
+	*/
+
+	const char* bprefix;
 
 	if (rep.space < 1048576.0f) {
-		if (removed > 1) {
-			txt.set_text (string_compose (msg, removed, _("files were"), dead_sound_directory, (float) rep.space / 1024.0f, "kilo"));
-		} else {
-			txt.set_text (string_compose (msg, removed, _("file was"), dead_sound_directory, (float) rep.space / 1024.0f, "kilo"));
-		}
+		bprefix = X_("kilo");
+	} else if (rep.space < 1048576.0f * 1000) {
+		bprefix = X_("mega");
 	} else {
-		if (removed > 1) {
-			txt.set_text (string_compose (msg, removed, _("files were"), dead_sound_directory, (float) rep.space / 1048576.0f, "mega"));
-		} else {
-			txt.set_text (string_compose (msg, removed, _("file was"), dead_sound_directory, (float) rep.space / 1048576.0f, "mega"));
-		}
+		bprefix = X_("giga");
+	}
+
+	if (removed > 1) {
+		txt.set_text (string_compose (plural_msg, removed, dead_sound_directory, (float) rep.space / 1024.0f, bprefix));
+	} else {
+		txt.set_text (string_compose (singular_msg, removed, dead_sound_directory, (float) rep.space / 1024.0f, bprefix));
 	}
 
 	dhbox.pack_start (*dimage, true, false, 5);
@@ -2655,7 +2820,7 @@ require some unused files to continue to exist."));
 		row[results_columns.visible_name] = *i;
 		row[results_columns.fullpath] = *i;
 	}
-	
+
 	list_scroller.add (results_display);
 	list_scroller.set_size_request (-1, 150);
 	list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
@@ -2687,7 +2852,7 @@ require some unused files to continue to exist."));
 void
 ARDOUR_UI::cleanup ()
 {
-	if (session == 0) {
+	if (_session == 0) {
 		/* shouldn't happen: menu item is insensitive */
 		return;
 	}
@@ -2702,7 +2867,7 @@ ARDOUR_UI::cleanup ()
 ALL undo/redo information will be lost if you cleanup.\n\
 After cleanup, unused audio files will be moved to a \
 \"dead sounds\" location."));
-	
+
 	checker.add_button (Stock::CANCEL, RESPONSE_CANCEL);
 	checker.add_button (_("Clean Up"), RESPONSE_ACCEPT);
 	checker.set_default_response (RESPONSE_CANCEL);
@@ -2718,7 +2883,7 @@ After cleanup, unused audio files will be moved to a \
 		return;
 	}
 
-	Session::cleanup_report rep;
+	ARDOUR::CleanupReport rep;
 
 	editor->prepare_for_cleanup ();
 
@@ -2729,23 +2894,30 @@ After cleanup, unused audio files will be moved to a \
 		act->set_sensitive (false);
 	}
 
-	if (session->cleanup_sources (rep)) {
+	if (_session->cleanup_sources (rep)) {
 		editor->finish_cleanup ();
 		return;
 	}
-	
+
 	editor->finish_cleanup ();
 
 	checker.hide();
-	display_cleanup_results (rep, 
+	display_cleanup_results (rep,
 				 _("cleaned files"),
 				 _("\
-The following %1 %2 not in use and \n\
+The following %1 files were not in use and \n\
 have been moved to:\n\
-%3. \n\n\
+%2. \n\n\
+Flushing the wastebasket will \n\
+release an additional\n\
+%3 %4bytes of disk space.\n"),
+				 _("\
+The following file was not in use and \n	\
+has been moved to:\n				\
+%2. \n\n\
 Flushing the wastebasket will \n\
 release an additional\n\
-%4 %5bytes of disk space.\n"
+%3 %4bytes of disk space.\n"
 					 ));
 
 }
@@ -2753,22 +2925,25 @@ release an additional\n\
 void
 ARDOUR_UI::flush_trash ()
 {
-	if (session == 0) {
+	if (_session == 0) {
 		/* shouldn't happen: menu item is insensitive */
 		return;
 	}
 
-	Session::cleanup_report rep;
+	ARDOUR::CleanupReport rep;
 
-	if (session->cleanup_trash_sources (rep)) {
+	if (_session->cleanup_trash_sources (rep)) {
 		return;
 	}
 
-	display_cleanup_results (rep, 
+	display_cleanup_results (rep,
 				 _("deleted file"),
-				 _("The following %1 %2 deleted from\n\
-%3,\n\
-releasing %4 %5bytes of disk space"));
+				 _("The following %1 files were deleted from\n\
+%2,\n\
+releasing %3 %4bytes of disk space"),
+				 _("The following file was deleted from\n\
+%2,\n\
+releasing %3 %4bytes of disk space"));
 }
 
 void
@@ -2776,12 +2951,12 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 {
 	int count;
 
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
 	if (add_route_dialog == 0) {
-		add_route_dialog = new AddRouteDialog;
+		add_route_dialog = new AddRouteDialog (_session);
 		if (float_window) {
 			add_route_dialog->set_transient_for (*float_window);
 		}
@@ -2809,9 +2984,9 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 	}
 
 	string template_path = add_route_dialog->track_template();
-	
+
 	if (!template_path.empty()) {
-		session->new_route_from_template (count, template_path);
+		_session->new_route_from_template (count, template_path);
 		return;
 	}
 
@@ -2819,31 +2994,33 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 	uint32_t output_chan;
 	string name_template = add_route_dialog->name_template ();
 	bool track = add_route_dialog->track ();
+	bool aux = !track && add_route_dialog->aux();
+	RouteGroup* route_group = add_route_dialog->route_group ();
 
 	AutoConnectOption oac = Config->get_output_auto_connect();
 
 	if (oac & AutoConnectMaster) {
-		output_chan = (session->master_out() ? session->master_out()->n_inputs().n_audio() : input_chan);
+		output_chan = (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan);
 	} else {
 		output_chan = input_chan;
 	}
 
 	/* XXX do something with name template */
-	
+
 	if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
 		if (track) {
-			session_add_midi_track(count);
+			session_add_midi_track (route_group, count);
 		} else  {
 			MessageDialog msg (*editor,
 					_("Sorry, MIDI Busses are not supported at this time."));
 			msg.run ();
 			//session_add_midi_bus();
 		}
-	} else { 
+	} else {
 		if (track) {
-			session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), count);
+			session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count);
 		} else {
-			session_add_audio_bus (input_chan, output_chan, count);
+			session_add_audio_bus (aux, input_chan, output_chan, route_group, count);
 		}
 	}
 }
@@ -2853,8 +3030,8 @@ ARDOUR_UI::mixer_settings () const
 {
 	XMLNode* node = 0;
 
-	if (session) {
-		node = session->instant_xml(X_("Mixer"));
+	if (_session) {
+		node = _session->instant_xml(X_("Mixer"));
 	} else {
 		node = Config->instant_xml(X_("Mixer"));
 	}
@@ -2871,12 +3048,12 @@ ARDOUR_UI::editor_settings () const
 {
 	XMLNode* node = 0;
 
-	if (session) {
-		node = session->instant_xml(X_("Editor"));
+	if (_session) {
+		node = _session->instant_xml(X_("Editor"));
 	} else {
 		node = Config->instant_xml(X_("Editor"));
 	}
-	
+
 	if (!node) {
 		if (getenv("ARDOUR_INSTANT_XML_PATH")) {
 			node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH"));
@@ -2896,7 +3073,7 @@ ARDOUR_UI::keyboard_settings () const
 	XMLNode* node = 0;
 
 	node = Config->extra_xml(X_("Keyboard"));
-	
+
 	if (!node) {
 		node = new XMLNode (X_("Keyboard"));
 	}
@@ -2920,25 +3097,77 @@ ARDOUR_UI::halt_on_xrun_message ()
 void
 ARDOUR_UI::xrun_handler(nframes_t where)
 {
-	if (!session) {
+	if (!_session) {
 		return;
 	}
 
-	ENSURE_GUI_THREAD (bind(mem_fun(*this, &ARDOUR_UI::xrun_handler), where));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::xrun_handler, where)
 
-	if (session && Config->get_create_xrun_marker() && session->actively_recording()) {
+	if (_session && Config->get_create_xrun_marker() && _session->actively_recording()) {
 		create_xrun_marker(where);
 	}
 
-	if (session && Config->get_stop_recording_on_xrun() && session->actively_recording()) {
+	if (_session && Config->get_stop_recording_on_xrun() && _session->actively_recording()) {
 		halt_on_xrun_message ();
 	}
 }
 
+void
+ARDOUR_UI::push_buffer_stats (uint32_t capture, uint32_t playback)
+{
+	time_t now;
+	time (&now);
+
+	while (disk_buffer_stats.size() > 60) {
+		disk_buffer_stats.pop_front ();
+	}
+
+	disk_buffer_stats.push_back (DiskBufferStat (now, capture, playback));
+}
+
+void
+ARDOUR_UI::write_buffer_stats ()
+{
+
+	std::ofstream fout;
+	struct tm tm;
+	char buf[64];
+	char path[PATH_MAX+1];	int fd;
+
+	strcpy (path, "ardourBufferingXXXXXX");
+
+	if ((fd = mkstemp (path )) < 0) {
+		cerr << X_("cannot find temporary name for ardour buffer stats") << endl;
+		return;
+	}
+	
+	fout.open (path);
+	close (fd);
+
+	if (!fout) {
+		cerr << string_compose (X_("cannot open file %1 for ardour buffer stats"), path) << endl;
+		return;
+	}
+
+	for (list<DiskBufferStat>::iterator i = disk_buffer_stats.begin(); i != disk_buffer_stats.end(); ++i) {
+		localtime_r (&(*i).when, &tm);
+		strftime (buf, sizeof (buf), "%T", &tm);
+		fout << buf << ' ' << (*i).capture << ' ' << (*i).playback << endl;
+	}
+	
+	disk_buffer_stats.clear ();
+
+	fout.close ();
+
+	cerr << "Ardour buffering statistics can be found in: " << path << endl;
+}
+
 void
 ARDOUR_UI::disk_overrun_handler ()
 {
-	ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::disk_overrun_handler)
+
+	write_buffer_stats ();
 
 	if (!have_disk_speed_dialog_displayed) {
 		have_disk_speed_dialog_displayed = true;
@@ -2948,7 +3177,7 @@ was not able to keep up with Ardour.\n\
 \n\
 Specifically, it failed to write data to disk\n\
 quickly enough to keep up with recording.\n"));
-		msg->signal_response().connect (bind (mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
+		msg->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
 		msg->show ();
 	}
 }
@@ -2956,7 +3185,9 @@ quickly enough to keep up with recording.\n"));
 void
 ARDOUR_UI::disk_underrun_handler ()
 {
-	ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::disk_underrun_handler)
+
+	write_buffer_stats ();
 
 	if (!have_disk_speed_dialog_displayed) {
 		have_disk_speed_dialog_displayed = true;
@@ -2966,13 +3197,13 @@ was not able to keep up with Ardour.\n\
 \n\
 Specifically, it failed to read data from disk\n\
 quickly enough to keep up with playback.\n"));
-		msg->signal_response().connect (bind (mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
+		msg->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::disk_speed_dialog_gone), msg));
 		msg->show ();
-	} 
+	}
 }
 
 void
-ARDOUR_UI::disk_speed_dialog_gone (int ignored_response, MessageDialog* msg)
+ARDOUR_UI::disk_speed_dialog_gone (int /*ignored_response*/, MessageDialog* msg)
 {
 	have_disk_speed_dialog_displayed = false;
 	delete msg;
@@ -2981,8 +3212,8 @@ ARDOUR_UI::disk_speed_dialog_gone (int ignored_response, MessageDialog* msg)
 void
 ARDOUR_UI::session_dialog (std::string msg)
 {
-	ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::session_dialog), msg));
-	
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::session_dialog, msg)
+
 	MessageDialog* d;
 
 	if (editor) {
@@ -2994,7 +3225,7 @@ ARDOUR_UI::session_dialog (std::string msg)
 	d->show_all ();
 	d->run ();
 	delete d;
-}	
+}
 
 int
 ARDOUR_UI::pending_state_dialog ()
@@ -3061,7 +3292,7 @@ The audioengine is currently running at %2 Hz\n"), desired, actual));
 	}
 }
 
-	
+
 void
 ARDOUR_UI::disconnect_from_jack ()
 {
@@ -3091,53 +3322,6 @@ ARDOUR_UI::reconnect_to_jack ()
 void
 ARDOUR_UI::use_config ()
 {
-	Glib::RefPtr<Action> act;
-
-	switch (Config->get_native_file_data_format ()) {
-	case FormatFloat:
-		act = ActionManager::get_action (X_("options"), X_("FileDataFormatFloat"));
-		break;
-	case FormatInt24:
-		act = ActionManager::get_action (X_("options"), X_("FileDataFormat24bit"));
-		break;
-	case FormatInt16:
-		act = ActionManager::get_action (X_("options"), X_("FileDataFormat16bit"));
-		break;
-	}
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		ract->set_active ();
-	}	
-
-	switch (Config->get_native_file_header_format ()) {
-	case BWF:
-		act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatBWF"));
-		break;
-	case WAVE:
-		act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatWAVE"));
-		break;
-	case WAVE64:
-		act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatWAVE64"));
-		break;
-	case iXML:
-		act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatiXML"));
-		break;
-	case RF64:
-		act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatRF64"));
-		break;
-	case CAF:
-		act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatCAF"));
-		break;
-	case AIFF:
-		act = ActionManager::get_action (X_("options"), X_("FileHeaderFormatAIFF"));
-		break;
-	}
-
-	if (act) {
-		Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic(act);
-		ract->set_active ();
-	}	
 
 	XMLNode* node = Config->extra_xml (X_("TransportControllables"));
 	if (node) {
@@ -3168,28 +3352,28 @@ ARDOUR_UI::update_transport_clocks (nframes_t pos)
 void
 ARDOUR_UI::record_state_changed ()
 {
-	ENSURE_GUI_THREAD (mem_fun (*this, &ARDOUR_UI::record_state_changed));
+	ENSURE_GUI_THREAD (*this, &ARDOUR_UI::record_state_changed);
 
-	if (!session || !big_clock_window) {
+	if (!_session || !big_clock_window) {
 		/* why bother - the clock isn't visible */
 		return;
 	}
 
-	switch (session->record_status()) {
-	case Session::Recording:
+	Session::RecordState const r = _session->record_status ();
+	bool const h = _session->have_rec_enabled_diskstream ();
+
+	if (r == Session::Recording && h)  {
 		big_clock.set_widget_name ("BigClockRecording");
-		break;
-	default:
+	} else {
 		big_clock.set_widget_name ("BigClockNonRecording");
-		break;
 	}
 }
 
 bool
 ARDOUR_UI::first_idle ()
 {
-	if (session) {
-		session->allow_auto_play (true);
+	if (_session) {
+		_session->allow_auto_play (true);
 	}
 
 	if (editor) {
@@ -3209,16 +3393,16 @@ ARDOUR_UI::store_clock_modes ()
 		node->add_property ((*x)->name().c_str(), enum_2_string ((*x)->mode()));
 	}
 
-	session->add_extra_xml (*node);
-	session->set_dirty ();
+	_session->add_extra_xml (*node);
+	_session->set_dirty ();
 }
 
 
-		
+
 ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOUR_UI& u, ToggleType tp)
-	: Controllable (name), ui (u), type(tp)
+	: Controllable (name,  string() /* missing URI */), ui (u), type(tp)
 {
-	
+
 }
 
 void
@@ -3236,7 +3420,7 @@ ARDOUR_UI::TransportControllable::set_value (float val)
 				fract = ((val - 0.5f)/0.5f);
 			}
 		}
-		
+
 		ui.set_shuttle_fract (fract);
 		return;
 	}
@@ -3289,7 +3473,7 @@ float
 ARDOUR_UI::TransportControllable::get_value (void) const
 {
 	float val = 0.0f;
-	
+
 	switch (type) {
 	case Roll:
 		break;