X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_ui.cc;h=f86defaaf40bf6cd174c686af90dbca26f5cc9c1;hb=a0b9c52a5e781f4b1514ffe8c21d2250b5c0ebaf;hp=0c44a7829e9fd6f31190f143ca251f5481b90e18;hpb=922e79c94ad0fa6407bbc87e3a862c5c8eea2ee7;p=ardour.git

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 0c44a7829e..f86defaaf4 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -84,7 +84,6 @@ typedef uint64_t microseconds_t;
 #include "prompter.h"
 #include "opts.h"
 #include "add_route_dialog.h"
-#include "new_session_dialog.h"
 #include "about.h"
 #include "splash.h"
 #include "utils.h"
@@ -95,6 +94,7 @@ typedef uint64_t microseconds_t;
 #include "gain_meter.h"
 #include "route_time_axis.h"
 #include "startup.h"
+#include "engine_dialog.h"
 
 #include "i18n.h"
 
@@ -172,7 +172,12 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	
 
 #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;
@@ -196,10 +201,10 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 	session_selector_window = 0;
 	last_key_press_time = 0;
 	_will_create_new_session_automatically = false;
-	new_session_dialog = 0;
 	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;
@@ -253,7 +258,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 		}
 
 		setup_gtk_ardour_enums ();
-		Config->set_current_owner (ConfigVariableBase::Interface);
 		setup_profile ();
 
 		GainMeter::setup_slider_pix ();
@@ -278,14 +282,20 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
 }
 
 void
-ARDOUR_UI::run_startup ()
+ARDOUR_UI::run_startup (bool should_be_new)
 {
 	if (_startup == 0) {
 		_startup = new ArdourStartup ();
 	}
 
+	_startup->set_new_only (should_be_new);
 	_startup->present ();
+
 	main().run();
+
+	/* we don't return here until the startup assistant is finished */	
+
+	_startup->hide ();
 }
 
 int
@@ -356,10 +366,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);
@@ -407,7 +413,6 @@ ARDOUR_UI::~ARDOUR_UI ()
 	delete editor;
 	delete mixer;
 	delete add_route_dialog;
-	delete new_session_dialog;
 }
 
 void
@@ -440,7 +445,7 @@ 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();
@@ -523,8 +528,8 @@ ARDOUR_UI::save_ardour_state ()
 	XMLNode* node = new XMLNode (keyboard->get_state());
 	Config->add_extra_xml (*node);
 	Config->add_extra_xml (get_transport_controllable_state());
-	if (new_session_dialog && new_session_dialog->engine_control.was_used()) {
-		Config->add_extra_xml (new_session_dialog->engine_control.get_state());
+	if (_startup && _startup->engine_control() && _startup->engine_control()->was_used()) {
+		Config->add_extra_xml (_startup->engine_control()->get_state());
 	}
 	Config->save_state();
 	ui_config->save_state ();
@@ -534,7 +539,7 @@ ARDOUR_UI::save_ardour_state ()
 
 	if (session) {
 		session->add_instant_xml (enode);
-	session->add_instant_xml (mnode);
+		session->add_instant_xml (mnode);
 	} else {
 		Config->add_instant_xml (enode);
 		Config->add_instant_xml (mnode);
@@ -641,20 +646,19 @@ Please consider the possibilities, and perhaps (re)start JACK."));
 void
 ARDOUR_UI::startup ()
 {
-	string name, path;
-	
-	new_session_dialog = new NewSessionDialog();
-
-	bool backend_audio_is_running = EngineControl::engine_running();
 	XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
 	
-	if (audio_setup) {
-		new_session_dialog->engine_control.set_state (*audio_setup);
+	if (audio_setup && _startup && _startup->engine_control()) {
+		_startup->engine_control()->set_state (*audio_setup);
 	}
 	
-	if (!get_session_parameters (backend_audio_is_running, ARDOUR_COMMAND_LINE::new_session)) {
-		return;
+	if (get_session_parameters (ARDOUR_COMMAND_LINE::new_session)) {
+		exit (1);
 	}
+
+	use_config ();
+
+	goto_editor_window ();
 	
 	BootMessage (_("Ardour is ready for use"));
 	show ();
@@ -734,7 +738,7 @@ ARDOUR_UI::finish()
 
 		if (session->transport_rolling()) {
 			session->request_stop ();
-			usleep (2500000);
+			usleep (250000);
 		}
 
 		if (session->dirty()) {
@@ -800,7 +804,7 @@ ARDOUR_UI::ask_about_saving_session (const string & what)
 	} 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?"), 
+	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);
@@ -908,8 +912,14 @@ void
 ARDOUR_UI::update_buffer_load ()
 {
 	char buf[64];
+	uint32_t c, p;
 
 	if (session) {
+		c = session->capture_load ();
+		p = session->playback_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);
@@ -990,7 +1000,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;
@@ -1082,7 +1092,7 @@ 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);
 	
@@ -1109,7 +1119,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);
 }
@@ -1237,7 +1247,7 @@ 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;
 
@@ -1249,7 +1259,7 @@ ARDOUR_UI::session_add_midi_route (bool disk, uint32_t how_many)
 	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) {
@@ -1277,7 +1287,7 @@ 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, 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;
@@ -1289,7 +1299,7 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
 
 	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) {
@@ -1302,7 +1312,7 @@ ARDOUR_UI::session_add_audio_route (bool track, int32_t input_channels, int32_t
 
 		} else {
 
-			routes = session->new_audio_route (input_channels, output_channels, how_many);
+			routes = session->new_audio_route (input_channels, output_channels, route_group, how_many);
 
 			if (routes.size() != how_many) {
 				if (how_many == 1) {
@@ -1830,44 +1840,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.
  */
@@ -1891,11 +1863,33 @@ ARDOUR_UI::snapshot_session ()
 	
 	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;
@@ -1956,23 +1950,20 @@ ARDOUR_UI::transport_rec_enable_blink (bool onoff)
 	if (session == 0) {
 		return;
 	}
+
+	Session::RecordState const r = session->record_status ();
+	bool const h = session->have_rec_enabled_diskstream ();
 	
-	switch (session->record_status()) {
-	case Session::Enabled:
+	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;
 	}
 }
 
@@ -2035,7 +2026,7 @@ ARDOUR_UI::fontconfig_dialog ()
 	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 (*new_session_dialog,
+		MessageDialog msg (*_startup,
 				   _("Welcome to Ardour.\n\n"
 				     "The program will take a bit longer to start up\n"
 				     "while the system fonts are checked.\n\n"
@@ -2113,7 +2104,7 @@ ARDOUR_UI::load_cmdline_session (const Glib::ustring& session_name, const Glib::
 	/* lets just try to load it */
 	
 	if (create_engine ()) {
-		backend_audio_error (false, new_session_dialog);
+		backend_audio_error (false, _startup);
 		return -1;
 	}
 	
@@ -2169,19 +2160,19 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 		
 		/* get settings from advanced section of NSD */
 		
-		if (new_session_dialog->create_control_bus()) {
-			cchns = (uint32_t) new_session_dialog->control_channel_count();
+		if (_startup->create_control_bus()) {
+			cchns = (uint32_t) _startup->control_channel_count();
 		} else {
 			cchns = 0;
 		}
 		
-		if (new_session_dialog->create_master_bus()) {
-			mchns = (uint32_t) new_session_dialog->master_channel_count();
+		if (_startup->create_master_bus()) {
+			mchns = (uint32_t) _startup->master_channel_count();
 		} else {
 			mchns = 0;
 		}
 		
-		if (new_session_dialog->connect_inputs()) {
+		if (_startup->connect_inputs()) {
 			iconnect = AutoConnectPhysical;
 		} else {
 			iconnect = AutoConnectOption (0);
@@ -2189,16 +2180,16 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 		
 		/// @todo some minor tweaks.
 		
-		if (new_session_dialog->connect_outs_to_master()) {
+		if (_startup->connect_outs_to_master()) {
 			oconnect = AutoConnectMaster;
-		} else if (new_session_dialog->connect_outs_to_physical()) {
+		} else if (_startup->connect_outs_to_physical()) {
 			oconnect = AutoConnectPhysical;
 		} else {
 			oconnect = AutoConnectOption (0);
 		} 
 		
-		nphysin = (uint32_t) new_session_dialog->input_limit_count();
-		nphysout = (uint32_t) new_session_dialog->output_limit_count();
+		nphysin = (uint32_t) _startup->input_limit_count();
+		nphysout = (uint32_t) _startup->output_limit_count();
 	}
 	
 	if (build_session (session_path,
@@ -2217,20 +2208,6 @@ ARDOUR_UI::build_session_from_nsd (const Glib::ustring& session_path, const Glib
 	return 0;
 }
 
-void
-ARDOUR_UI::end_loading_messages ()
-{
-	// hide_splash ();
-}
-
-void
-ARDOUR_UI::loading_message (const std::string& msg)
-{
-	// show_splash ();
-	// splash->message (msg);
-	flush_pending ();
-}
-
 void
 ARDOUR_UI::idle_load (const Glib::ustring& path)
 {
@@ -2246,218 +2223,141 @@ ARDOUR_UI::idle_load (const Glib::ustring& path)
 
 		ARDOUR_COMMAND_LINE::session_name = path;
 
-		if (new_session_dialog) {
+		/*
+		 * 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);
-		}
+			//new_session_dialog->response (1);
+		//}
 	}
 }
 
-/** @param offer_quit true to offer a Cancel button, otherwise call it Quit */
-bool
-ARDOUR_UI::get_session_parameters (bool backend_audio_is_running, bool should_be_new, bool offer_cancel)
+void
+ARDOUR_UI::end_loading_messages ()
+{
+	// hide_splash ();
+}
+
+void
+ARDOUR_UI::loading_message (const std::string& /*msg*/)
+{
+	// show_splash ();
+	// splash->message (msg);
+	flush_pending ();
+}
+
+int
+ARDOUR_UI::get_session_parameters (bool should_be_new)
 {
-	bool existing_session = false;
 	Glib::ustring session_name;
 	Glib::ustring session_path;
 	Glib::ustring template_name;
-	int response;
-
-  begin:
-	response = Gtk::RESPONSE_NONE;
-
-	if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
-
-		parse_cmdline_path (ARDOUR_COMMAND_LINE::session_name, session_name, session_path, existing_session);
-
-		/* don't ever reuse this */
+	int ret = -1;
+	bool likely_new = false;
 
-		ARDOUR_COMMAND_LINE::session_name = string();
+	while (ret != 0) {
 
-		if (existing_session && backend_audio_is_running) {
+		if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
 
-			/* just load the thing already */
+			/* 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.
+			*/
 
-			if (load_cmdline_session (session_name, session_path, existing_session) == 0) {
-				return true;
+			if (ARDOUR_COMMAND_LINE::session_name.find (statefile_suffix) != string::npos) {
+				session_path = Glib::path_get_dirname (ARDOUR_COMMAND_LINE::session_name);
+			} else {
+				session_path = ARDOUR_COMMAND_LINE::session_name;
 			}
-		}
-
-		/* make the NSD use whatever information we have */
-
-		new_session_dialog->set_session_name (session_name);
-		new_session_dialog->set_session_folder (session_path);
-	}
-
-	/* loading failed, or we need the NSD for something */
 
-	new_session_dialog->set_modal (false);
-	new_session_dialog->set_position (WIN_POS_CENTER);
-	new_session_dialog->set_current_page (0);
-	new_session_dialog->set_existing_session (existing_session);
-	new_session_dialog->reset_recent();
-	new_session_dialog->set_offer_cancel (offer_cancel);
+			session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
 
-	do {
-		new_session_dialog->set_have_engine (backend_audio_is_running);
-		new_session_dialog->present ();
-		end_loading_messages ();
-		response = new_session_dialog->run ();
-		
-		_session_is_new = false;
-		
-		/* handle possible negative responses */
-
-		switch (response) {
-		case 1:
-			/* sent by idle_load, meaning restart the whole process again */
-			new_session_dialog->hide();
-			new_session_dialog->reset();
-			goto begin;
-			break;
+		} else {
 
-		case Gtk::RESPONSE_CANCEL:
-		case Gtk::RESPONSE_DELETE_EVENT:
-			if (!session) {
-				if (engine && engine->running()) {
-					engine->stop (true);
-				}
-				quit();
-			}
-			new_session_dialog->hide ();
-			return false;
+			run_startup (should_be_new);
 			
-		case Gtk::RESPONSE_NONE:
-			/* "Clear" was pressed */
-			goto try_again;
-		}
-
-		fontconfig_dialog();
-
-		if (!backend_audio_is_running) {
-			int ret = new_session_dialog->engine_control.setup_engine ();
-			if (ret < 0) {
-				return false;
-			} else if (ret > 0) {
-				response = Gtk::RESPONSE_REJECT;
-				goto try_again;
-			}
-		}
-		
-		if (create_engine ()) {
-
-			backend_audio_error (!backend_audio_is_running, new_session_dialog);
-			flush_pending ();
-
-			new_session_dialog->set_existing_session (false);
-			new_session_dialog->set_current_page (2);
-
-			response = Gtk::RESPONSE_NONE;
-			goto try_again;
-		}
-
-		backend_audio_is_running = true;		
+			/* 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 (response == Gtk::RESPONSE_OK) {
-
-			session_name = new_session_dialog->session_name();
-
 			if (session_name.empty()) {
-				response = Gtk::RESPONSE_NONE;
-				goto try_again;
+				break;
+			} 
+			if (_startup->use_session_template()) {
+				template_name = _startup->session_template_name();
+				_session_is_new = true;
 			} 
 
-			/* if the user mistakenly typed path information into the session filename entry,
-			   convert what they typed into a path & a name
-			*/
-			
+
 			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 = new_session_dialog->session_folder();
+				
+				session_path = _startup->session_folder();
 			}
+		}
 
-			template_name = Glib::ustring();			
-			switch (new_session_dialog->which_page()) {
+		if (create_engine ()) {
+			break;
+		}
+		
+		if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
 
-			case NewSessionDialog::OpenPage: 
-			case NewSessionDialog::EnginePage:
-				goto loadit;
-				break;
+			if (likely_new) {
 
-			case NewSessionDialog::NewPage: /* nominally the "new" session creator, but could be in use for an old session */
-				
-				should_be_new = true;
+				Glib::ustring existing = Glib::build_filename (session_path, session_name);
 				
-				//XXX This is needed because session constructor wants a 
-				//non-existant path. hopefully this will be fixed at some point.
-				
-				session_path = Glib::build_filename (session_path, session_name);
-
-				if (Glib::file_test (session_path, Glib::FileTest (G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR))) {
-
-					if (ask_about_loading_existing_session (session_path)) {
-						goto loadit;
-					} else {
-						response = RESPONSE_NONE;
-						goto try_again;
-					} 
-				}
+				if (!ask_about_loading_existing_session (existing)) {
+					ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+					continue;
+				} 
+			} 
 
-			        _session_is_new = true;
-						
-				if (new_session_dialog->use_session_template()) {
+			_session_is_new = false;
 
-					template_name = new_session_dialog->session_template_name();
-					goto loadit;
-			  
-				} else {
-					if (build_session_from_nsd (session_path, session_name)) {
-						response = RESPONSE_NONE;
-						goto try_again;
-					}
-					goto done;
-				}
-				break;
-				
-			default:
-				break;
-			}
-			
-		  loadit:
-			new_session_dialog->hide ();
+		} else {
 
-			if (load_session (session_path, session_name, template_name)) {
-				/* force a retry */
-				response = Gtk::RESPONSE_NONE;
+			if (!likely_new) {
+				MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
+				msg.run ();
+				ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
+				continue;
 			}
 
-		  try_again:
-			if (response == Gtk::RESPONSE_NONE) {
-				new_session_dialog->set_existing_session (false);
-				new_session_dialog->reset ();
-			}
+			_session_is_new = true;
 		}
 
-	} while (response == Gtk::RESPONSE_NONE || response == Gtk::RESPONSE_REJECT);
+		if (likely_new && template_name.empty()) {
+			
+			ret = build_session_from_nsd (session_path, session_name);
 
-  done:
-	show();
-	new_session_dialog->hide();
-	new_session_dialog->reset();
-	goto_editor_window ();
-	return true;
+		} else {
+
+			ret = load_session (session_path, session_name, template_name);
+		}
+	}
+	
+	return ret;
 }	
 
 void
@@ -2469,7 +2369,8 @@ ARDOUR_UI::close_session()
 
 	unload_session (true);
 
-	get_session_parameters (true, false);
+	ARDOUR_COMMAND_LINE::session_name = "";
+	get_session_parameters (false);
 }
 
 int
@@ -2566,8 +2467,6 @@ ARDOUR_UI::load_session (const Glib::ustring& path, const Glib::ustring& snap_na
 
 	connect_to_session (new_session);
 
-	Config->set_current_owner (ConfigVariableBase::Interface);
-
 	session_loaded = true;
 	
 	goto_editor_window ();
@@ -2669,7 +2568,7 @@ ARDOUR_UI::hide_about ()
 }
 
 void
-ARDOUR_UI::about_signal_response(int response)
+ARDOUR_UI::about_signal_response (int /*response*/)
 {
 	hide_about();
 }
@@ -2701,7 +2600,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 (Session::cleanup_report& rep, const gchar* list_title, 
+				    const string& plural_msg, const string& singular_msg)
 {
 	size_t removed;
 
@@ -2758,18 +2658,30 @@ require some unused files to continue to exist."));
 
 	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);
@@ -2865,12 +2777,19 @@ After cleanup, unused audio files will be moved to a \
 	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\
-%4 %5bytes of disk space.\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\
+%3 %4bytes of disk space.\n"
 					 ));
 
 }
@@ -2891,9 +2810,12 @@ ARDOUR_UI::flush_trash ()
 
 	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
@@ -2906,7 +2828,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 	}
 
 	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);
 		}
@@ -2944,6 +2866,7 @@ 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 ();
+	RouteGroup* route_group = add_route_dialog->route_group ();
 
 	AutoConnectOption oac = Config->get_output_auto_connect();
 
@@ -2957,7 +2880,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 	
 	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."));
@@ -2966,9 +2889,9 @@ ARDOUR_UI::add_route (Gtk::Window* float_window)
 		}
 	} 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 (input_chan, output_chan, route_group, count);
 		}
 	}
 }
@@ -3060,11 +2983,63 @@ ARDOUR_UI::xrun_handler(nframes_t where)
 	}
 }
 
+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 ()
+{
+	struct tm tm;
+	char buf[64];
+	char* path;
+
+	char* tmplt = (char*)calloc(strlen("ardourXXXXXX"), sizeof(char));
+	int fd = mkstemp (tmplt);
+	if (fd) {
+		cerr << X_("cannot find temporary name for ardour buffer stats") << endl;
+		return;
+	}
+
+	FILE* fout = fdopen (fd, "w");
+	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) {
+		std::ostringstream ss;
+		localtime_r (&(*i).when, &tm);
+		strftime (buf, sizeof (buf), "%T", &tm);
+		fprintf(fout, "%s %u %u\n", buf, (*i).capture, (*i).playback);
+	}
+	
+	disk_buffer_stats.clear ();
+
+	fclose (fout);
+	close (fd);
+
+	cerr << "Ardour buffering statistics can be found in: " << path << endl;
+	free (path);
+	free (tmplt);
+}
+
 void
 ARDOUR_UI::disk_overrun_handler ()
 {
 	ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_overrun_handler));
 
+	write_buffer_stats ();
+
 	if (!have_disk_speed_dialog_displayed) {
 		have_disk_speed_dialog_displayed = true;
 		MessageDialog* msg = new MessageDialog (*editor, _("\
@@ -3083,6 +3058,8 @@ ARDOUR_UI::disk_underrun_handler ()
 {
 	ENSURE_GUI_THREAD (mem_fun(*this, &ARDOUR_UI::disk_underrun_handler));
 
+	write_buffer_stats ();
+
 	if (!have_disk_speed_dialog_displayed) {
 		have_disk_speed_dialog_displayed = true;
 		MessageDialog* msg = new MessageDialog (*editor,
@@ -3097,7 +3074,7 @@ quickly enough to keep up with playback.\n"));
 }
 
 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;
@@ -3216,53 +3193,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) {
@@ -3300,13 +3230,13 @@ ARDOUR_UI::record_state_changed ()
 		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;
 	}
 }