X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_state.cc;h=3c8fe86c13fc6359a307fb121f2bc2331ecb9034;hb=d9c9acaa80d1701b210eae82f5a365cb3e63c56a;hp=32e31580af1c240fa6a4891f7ed928d32483bc61;hpb=8e7a5d77414a40550a28d61abf6eeb1e89a1ec25;p=ardour.git

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 32e31580af..3c8fe86c13 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1,12 +1,12 @@
 /*
-  Copyright (C) 1999-2002 Paul Davis 
+  Copyright (C) 1999-2002 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
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 
-  This program is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
@@ -14,9 +14,14 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    
+
 */
 
+
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #define __STDC_FORMAT_MACROS 1
 #include <stdint.h>
 
@@ -25,7 +30,6 @@
 #include <string>
 #include <cerrno>
 
-#include <sigc++/bind.h>
 
 #include <cstdio> /* snprintf(3) ... grrr */
 #include <cmath>
@@ -52,58 +56,63 @@
 #include "midi++/mmc.h"
 #include "midi++/port.h"
 
+#include "pbd/boost_debug.h"
+#include "pbd/enumwriter.h"
 #include "pbd/error.h"
 #include "pbd/pathscanner.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/search_path.h"
 #include "pbd/stacktrace.h"
 
+#include "ardour/amp.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
-#include "ardour/configuration.h"
-#include "ardour/session.h"
-#include "ardour/session_directory.h"
-#include "ardour/session_utils.h"
-#include "ardour/session_state_utils.h"
-#include "ardour/session_metadata.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/audioplaylist.h"
+#include "ardour/audioregion.h"
+#include "ardour/auditioner.h"
 #include "ardour/buffer.h"
-#include "ardour/audio_diskstream.h"
+#include "ardour/butler.h"
+#include "ardour/configuration.h"
+#include "ardour/control_protocol_manager.h"
+#include "ardour/crossfade.h"
+#include "ardour/cycle_timer.h"
+#include "ardour/directory_names.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/io_processor.h"
+#include "ardour/location.h"
 #include "ardour/midi_diskstream.h"
-#include "ardour/utils.h"
-#include "ardour/audioplaylist.h"
+#include "ardour/midi_patch_manager.h"
 #include "ardour/midi_playlist.h"
-#include "ardour/smf_source.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/silentfilesource.h"
-#include "ardour/sndfilesource.h"
+#include "ardour/midi_region.h"
 #include "ardour/midi_source.h"
-#include "ardour/sndfile_helpers.h"
-#include "ardour/auditioner.h"
-#include "ardour/io_processor.h"
-#include "ardour/send.h"
-#include "ardour/processor.h"
-#include "ardour/user_bundle.h"
-#include "ardour/slave.h"
-#include "ardour/tempo.h"
-#include "ardour/audio_track.h"
 #include "ardour/midi_track.h"
-#include "ardour/midi_patch_manager.h"
-#include "ardour/cycle_timer.h"
-#include "ardour/utils.h"
 #include "ardour/named_selection.h"
-#include "ardour/version.h"
-#include "ardour/location.h"
-#include "ardour/audioregion.h"
-#include "ardour/midi_region.h"
-#include "ardour/crossfade.h"
-#include "ardour/control_protocol_manager.h"
+#include "ardour/processor.h"
 #include "ardour/region_factory.h"
+#include "ardour/route_group.h"
+#include "ardour/send.h"
+#include "ardour/session.h"
+#include "ardour/session_directory.h"
+#include "ardour/session_metadata.h"
+#include "ardour/session_state_utils.h"
+#include "ardour/session_playlists.h"
+#include "ardour/session_utils.h"
+#include "ardour/silentfilesource.h"
+#include "ardour/slave.h"
+#include "ardour/smf_source.h"
+#include "ardour/sndfile_helpers.h"
+#include "ardour/sndfilesource.h"
 #include "ardour/source_factory.h"
-#include "ardour/playlist_factory.h"
-#include "ardour/filename_extensions.h"
-#include "ardour/directory_names.h"
 #include "ardour/template_utils.h"
+#include "ardour/tempo.h"
 #include "ardour/ticker.h"
-#include "ardour/route_group.h"
+#include "ardour/user_bundle.h"
+#include "ardour/utils.h"
+#include "ardour/utils.h"
+#include "ardour/version.h"
+#include "ardour/playlist_factory.h"
 
 #include "control_protocol/control_protocol.h"
 
@@ -135,6 +144,14 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 		_path += '/';
 	}
 
+	if (Glib::file_test (_path, Glib::FILE_TEST_EXISTS) && ::access (_path.c_str(), W_OK)) {
+		cerr << "Session non-writable based on " << _path << endl;
+		_writable = false;
+	} else {
+		cerr << "Session writable based on " << _path << endl;
+		_writable = true;
+	}
+
 	/* these two are just provisional settings. set_state()
 	   will likely override them.
 	*/
@@ -148,10 +165,11 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	_base_frame_rate = _current_frame_rate;
 
 	_tempo_map = new TempoMap (_current_frame_rate);
-	_tempo_map->StateChanged.connect (mem_fun (*this, &Session::tempo_map_changed));
+	_tempo_map->StateChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));
 
 
 	_non_soloed_outs_muted = false;
+	_listen_cnt = 0;
 	g_atomic_int_set (&processing_prohibited, 0);
 	_transport_speed = 0;
 	_last_transport_speed = 0;
@@ -159,6 +177,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	auto_play_legal = false;
 	transport_sub_state = 0;
 	_transport_frame = 0;
+	_requested_return_frame = -1;
 	end_location = new Location (0, 0, _("end"), Location::Flags ((Location::IsMark|Location::IsEnd)));
 	start_location = new Location (0, 0, _("start"), Location::Flags ((Location::IsMark|Location::IsStart)));
 	g_atomic_int_set (&_record_status, Disabled);
@@ -170,32 +189,27 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	pending_locate_frame = 0;
 	pending_locate_roll = false;
 	pending_locate_flush = false;
-	audio_dstream_buffer_size = 0;
-	midi_dstream_buffer_size = 0;
 	state_was_pending = false;
 	set_next_event ();
-	outbound_mtc_smpte_frame = 0;
+	outbound_mtc_timecode_frame = 0;
 	next_quarter_frame_to_send = -1;
 	current_block_size = 0;
 	solo_update_disabled = false;
 	_have_captured = false;
 	_worst_output_latency = 0;
 	_worst_input_latency = 0;
-	_worst_track_latency = 0;
+ 	_worst_track_latency = 0;
 	_state_of_the_state = StateOfTheState(CannotSave|InitialConnecting|Loading);
-
+	_was_seamless = Config->get_seamless_loop ();
 	_slave = 0;
 	session_send_mmc = false;
 	session_send_mtc = false;
-	post_transport_work = PostTransportWork (0);
-	g_atomic_int_set (&butler_should_do_transport_work, 0);
 	g_atomic_int_set (&_playback_load, 100);
 	g_atomic_int_set (&_capture_load, 100);
 	g_atomic_int_set (&_playback_load_min, 100);
 	g_atomic_int_set (&_capture_load_min, 100);
 	_play_range = false;
 	_exporting = false;
-	_exporting_realtime = false;
 	_gain_automation_buffer = 0;
 	_pan_automation_buffer = 0;
 	_npan_buffers = 0;
@@ -203,8 +217,8 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	destructive_index = 0;
 	first_file_data_format_reset = true;
 	first_file_header_format_reset = true;
-	butler_thread = (pthread_t) 0;
-	//midi_thread = (pthread_t) 0;
+	post_export_sync = false;
+	midi_control_ui = 0;
 
 	AudioDiskstream::allocate_working_buffers();
 
@@ -220,7 +234,7 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	/* click sounds are unset by default, which causes us to internal
 	   waveforms for clicks.
 	*/
-	
+
 	click_length = 0;
 	click_emphasis_length = 0;
 	_clicking = false;
@@ -233,10 +247,10 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 		waiting_for_sync_offset = false;
 	}
 
-	last_smpte_when = 0;
-	_smpte_offset = 0;
-	_smpte_offset_negative = true;
-	last_smpte_valid = false;
+	last_timecode_when = 0;
+	_timecode_offset = 0;
+	_timecode_offset_negative = true;
+	last_timecode_valid = false;
 
 	sync_time_vars ();
 
@@ -250,22 +264,19 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	average_slave_delta = 1800; // !!! why 1800 ????
 	have_first_delta_accumulator = false;
 	delta_accumulator_cnt = 0;
-	slave_state = Stopped;
+	_slave_state = Stopped;
 
-	_engine.GraphReordered.connect (mem_fun (*this, &Session::graph_reordered));
+	_engine.GraphReordered.connect_same_thread (*this, boost::bind (&Session::graph_reordered, this));
 
 	/* These are all static "per-class" signals */
 
-	RegionFactory::CheckNewRegion.connect (mem_fun (*this, &Session::add_region));
-	SourceFactory::SourceCreated.connect (mem_fun (*this, &Session::add_source));
-	PlaylistFactory::PlaylistCreated.connect (mem_fun (*this, &Session::add_playlist));
-	Processor::ProcessorCreated.connect (mem_fun (*this, &Session::add_processor));
-	NamedSelection::NamedSelectionCreated.connect (mem_fun (*this, &Session::add_named_selection));
-	AutomationList::AutomationListCreated.connect (mem_fun (*this, &Session::add_automation_list));
-
-	Controllable::Destroyed.connect (mem_fun (*this, &Session::remove_controllable));
-
-	IO::PortCountChanged.connect (mem_fun (*this, &Session::ensure_buffers));
+	RegionFactory::CheckNewRegion.connect_same_thread (*this, boost::bind (&Session::add_region, this, _1));
+	SourceFactory::SourceCreated.connect_same_thread (*this, boost::bind (&Session::add_source, this, _1));
+	PlaylistFactory::PlaylistCreated.connect_same_thread (*this, boost::bind (&Session::add_playlist, this, _1, _2));
+	Processor::ProcessorCreated.connect_same_thread (*this, boost::bind (&Session::add_processor, this, _1));
+	AutomationList::AutomationListCreated.connect_same_thread (*this, boost::bind (&Session::add_automation_list, this, _1));
+	Controllable::Destroyed.connect_same_thread (*this, boost::bind (&Session::remove_controllable, this, _1));
+	IO::PortCountChanged.connect_same_thread (*this, boost::bind (&Session::ensure_buffers, this, _1));
 
 	/* stop IO objects from doing stuff until we're ready for them */
 
@@ -285,7 +296,7 @@ Session::second_stage_init (bool new_session)
 		remove_empty_sounds ();
 	}
 
-	if (start_butler_thread()) {
+	if (_butler->start_thread()) {
 		return -1;
 	}
 
@@ -297,7 +308,7 @@ Session::second_stage_init (bool new_session)
 	// to call setup_raid_path() here.
 
 	if (state_tree) {
-		if (set_state (*state_tree->root())) {
+		if (set_state (*state_tree->root(), Stateful::loading_state_version)) {
 			return -1;
 		}
 	} else {
@@ -317,22 +328,22 @@ Session::second_stage_init (bool new_session)
 	_state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave|Loading);
 
 
-	_locations.changed.connect (mem_fun (this, &Session::locations_changed));
-	_locations.added.connect (mem_fun (this, &Session::locations_added));
+	_locations.changed.connect_same_thread (*this, boost::bind (&Session::locations_changed, this));
+	_locations.added.connect_same_thread (*this, boost::bind (&Session::locations_added, this, _1));
 	setup_click_sounds (0);
 	setup_midi_control ();
 
 	/* Pay attention ... */
 
-	_engine.Halted.connect (mem_fun (*this, &Session::engine_halted));
-	_engine.Xrun.connect (mem_fun (*this, &Session::xrun_recovery));
+	_engine.Halted.connect_same_thread (*this, boost::bind (&Session::engine_halted, this));
+	_engine.Xrun.connect_same_thread (*this, boost::bind (&Session::xrun_recovery, this));
 
 	try {
 		when_engine_running();
 	}
 
 	/* handle this one in a different way than all others, so that its clear what happened */
-	
+
 	catch (AudioEngine::PortRegistrationFailure& err) {
 		error << err.what() << endmsg;
 		return -1;
@@ -348,20 +359,20 @@ Session::second_stage_init (bool new_session)
 	_engine.transport_locate (0);
 	deliver_mmc (MIDI::MachineControl::cmdMmcReset, 0);
 	deliver_mmc (MIDI::MachineControl::cmdLocate, 0);
-	
-	MidiClockTicker::instance().set_session(*this);
-	MIDI::Name::MidiPatchManager::instance().set_session(*this);
+
+	MidiClockTicker::instance().set_session (this);
+	MIDI::Name::MidiPatchManager::instance().set_session (this);
 
 	/* initial program change will be delivered later; see ::config_changed() */
 
 	BootMessage (_("Reset Control Protocols"));
 
-	ControlProtocolManager::instance().set_session (*this);
+	ControlProtocolManager::instance().set_session (this);
 
 	config.set_end_marker_is_free (new_session);
 
 	_state_of_the_state = Clean;
-	
+
 	DirtyChanged (); /* EMIT SIGNAL */
 
 	if (state_was_pending) {
@@ -369,7 +380,7 @@ Session::second_stage_init (bool new_session)
 		remove_pending_capture_state ();
 		state_was_pending = false;
 	}
-	
+
 	BootMessage (_("Session loading complete"));
 
 	return 0;
@@ -383,7 +394,7 @@ Session::raid_path () const
 	for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
 		raid_search_path += sys::path((*i).path);
 	}
-	
+
 	return raid_search_path.to_string ();
 }
 
@@ -393,7 +404,7 @@ Session::setup_raid_path (string path)
 	if (path.empty()) {
 		return;
 	}
-	
+
 	space_and_path sp;
 	string fspath;
 
@@ -422,6 +433,17 @@ Session::setup_raid_path (string path)
 	last_rr_session_dir = session_dirs.begin();
 }
 
+bool
+Session::path_is_within_session (const std::string& path)
+{
+	for (vector<space_and_path>::const_iterator i = session_dirs.begin(); i != session_dirs.end(); ++i) {
+		if (path.find ((*i).path) == 0) {
+			return true;
+		}
+	}
+	return false;
+}
+
 int
 Session::ensure_subdirs ()
 {
@@ -440,7 +462,7 @@ Session::ensure_subdirs ()
 		error << string_compose(_("Session: cannot create session sounds dir \"%1\" (%2)"), dir, strerror (errno)) << endmsg;
 		return -1;
 	}
-	
+
 	dir = session_directory().midi_path().to_string();
 
 	if (g_mkdir_with_parents (dir.c_str(), 0755) < 0) {
@@ -509,21 +531,21 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia
 				return 0;
 
 			} else {
-				error << string_compose (_("Could not open %1 for writing mix template"), out_path) 
+				error << string_compose (_("Could not open %1 for writing mix template"), out_path)
 					<< endmsg;
 				return -1;
 			}
 
 		} else {
-			error << string_compose (_("Could not open mix template %1 for reading"), in_path) 
+			error << string_compose (_("Could not open mix template %1 for reading"), in_path)
 				<< endmsg;
 			return -1;
 		}
 
 	}
-	
+
 	/* Instantiate metadata */
-	
+
 	_metadata = new SessionMetadata ();
 
 	/* set initial start + end point */
@@ -547,7 +569,7 @@ Session::load_diskstreams (const XMLNode& node)
 {
 	XMLNodeList          clist;
 	XMLNodeConstIterator citer;
-	
+
 	clist = node.children();
 
 	for (citer = clist.begin(); citer != clist.end(); ++citer) {
@@ -555,7 +577,8 @@ Session::load_diskstreams (const XMLNode& node)
 		try {
 			/* diskstreams added automatically by DiskstreamCreated handler */
 			if ((*citer)->name() == "AudioDiskstream" || (*citer)->name() == "DiskStream") {
-				boost::shared_ptr<AudioDiskstream> dstream (new AudioDiskstream (*this, **citer));
+				AudioDiskstream* dsp (new AudioDiskstream (*this, **citer));
+				boost::shared_ptr<AudioDiskstream> dstream (dsp);
 				add_diskstream (dstream);
 			} else if ((*citer)->name() == "MidiDiskstream") {
 				boost::shared_ptr<MidiDiskstream> dstream (new MidiDiskstream (*this, **citer));
@@ -563,8 +586,8 @@ Session::load_diskstreams (const XMLNode& node)
 			} else {
 				error << _("Session: unknown diskstream type in XML") << endmsg;
 			}
-		} 
-		
+		}
+
 		catch (failed_constructor& err) {
 			error << _("Session: could not load diskstream via XML state") << endmsg;
 			return -1;
@@ -586,8 +609,8 @@ void
 Session::remove_pending_capture_state ()
 {
 	sys::path pending_state_file_path(_session_dir->root_path());
-	
-	pending_state_file_path /= _current_snapshot_name + pending_suffix;
+
+	pending_state_file_path /= legalize_for_path (_current_snapshot_name) + pending_suffix;
 
 	try
 	{
@@ -611,8 +634,8 @@ Session::rename_state (string old_name, string new_name)
 		return;
 	}
 
-	const string old_xml_filename = old_name + statefile_suffix;
-	const string new_xml_filename = new_name + statefile_suffix;
+	const string old_xml_filename = legalize_for_path (old_name) + statefile_suffix;
+	const string new_xml_filename = legalize_for_path (new_name) + statefile_suffix;
 
 	const sys::path old_xml_path = _session_dir->root_path() / old_xml_filename;
 	const sys::path new_xml_path = _session_dir->root_path() / new_xml_filename;
@@ -641,7 +664,7 @@ Session::remove_state (string snapshot_name)
 
 	sys::path xml_path(_session_dir->root_path());
 
-	xml_path /= snapshot_name + statefile_suffix;
+	xml_path /= legalize_for_path (snapshot_name) + statefile_suffix;
 
 	if (!create_backup_file (xml_path)) {
 		// don't remove it if a backup can't be made
@@ -659,7 +682,7 @@ Session::save_state (string snapshot_name, bool pending)
 	XMLTree tree;
 	sys::path xml_path(_session_dir->root_path());
 
-	if (_state_of_the_state & CannotSave) {
+	if (!_writable || (_state_of_the_state & CannotSave)) {
 		return 1;
 	}
 
@@ -683,8 +706,8 @@ Session::save_state (string snapshot_name, bool pending)
 	if (!pending) {
 
 		/* proper save: use statefile_suffix (.ardour in English) */
-		
-		xml_path /= snapshot_name + statefile_suffix;
+
+		xml_path /= legalize_for_path (snapshot_name) + statefile_suffix;
 
 		/* make a backup copy of the old file */
 
@@ -696,12 +719,12 @@ Session::save_state (string snapshot_name, bool pending)
 	} else {
 
 		/* pending save: use pending_suffix (.pending in English) */
-		xml_path /= snapshot_name + pending_suffix;
+		xml_path /= legalize_for_path (snapshot_name) + pending_suffix;
 	}
 
 	sys::path tmp_path(_session_dir->root_path());
 
-	tmp_path /= snapshot_name + temp_suffix;
+	tmp_path /= legalize_for_path (snapshot_name) + temp_suffix;
 
 	// cerr << "actually writing state to " << xml_path.to_string() << endl;
 
@@ -727,7 +750,7 @@ Session::save_state (string snapshot_name, bool pending)
 		bool was_dirty = dirty();
 
 		_state_of_the_state = StateOfTheState (_state_of_the_state & ~Dirty);
-		
+
 		if (was_dirty) {
 			DirtyChanged (); /* EMIT SIGNAL */
 		}
@@ -742,9 +765,9 @@ int
 Session::restore_state (string snapshot_name)
 {
 	if (load_state (snapshot_name) == 0) {
-		set_state (*state_tree->root());
+		set_state (*state_tree->root(), Stateful::loading_state_version);
 	}
-	
+
 	return 0;
 }
 
@@ -759,22 +782,22 @@ Session::load_state (string snapshot_name)
 	/* check for leftover pending state from a crashed capture attempt */
 
 	sys::path xmlpath(_session_dir->root_path());
-	xmlpath /= snapshot_name + pending_suffix;
+	xmlpath /= legalize_for_path (snapshot_name) + pending_suffix;
 
 	if (sys::exists (xmlpath)) {
 
 		/* there is pending state from a crashed capture attempt */
 
-		if (AskAboutPendingState()) {
+		if (*AskAboutPendingState()) {
 			state_was_pending = true;
-		} 
-	} 
+		}
+	}
 
 	if (!state_was_pending) {
 		xmlpath = _session_dir->root_path();
-		xmlpath /= snapshot_name + statefile_suffix;
+		xmlpath /= legalize_for_path (snapshot_name) + statefile_suffix;
 	}
-	
+
 	if (!sys::exists (xmlpath)) {
 		error << string_compose(_("%1: session state information file \"%2\" doesn't exist!"), _name, xmlpath.to_string()) << endmsg;
 		return 1;
@@ -784,6 +807,15 @@ Session::load_state (string snapshot_name)
 
 	set_dirty();
 
+	/* writable() really reflects the whole folder, but if for any
+	   reason the session state file can't be written to, still
+	   make us unwritable.
+	*/
+
+	if (::access (xmlpath.to_string().c_str(), W_OK) != 0) {
+		_writable = false;
+	}
+
 	if (!state_tree->read (xmlpath.to_string())) {
 		error << string_compose(_("Could not understand ardour file %1"), xmlpath.to_string()) << endmsg;
 		delete state_tree;
@@ -792,7 +824,7 @@ Session::load_state (string snapshot_name)
 	}
 
 	XMLNode& root (*state_tree->root());
-	
+
 	if (root.name() != X_("Session")) {
 		error << string_compose (_("Session file %1 is not an Ardour session"), xmlpath.to_string()) << endmsg;
 		delete state_tree;
@@ -801,24 +833,24 @@ Session::load_state (string snapshot_name)
 	}
 
 	const XMLProperty* prop;
-	bool is_old = false; // session is _very_ old (pre-2.0)
 
 	if ((prop = root.property ("version")) == 0) {
 		/* no version implies very old version of Ardour */
-		is_old = true;
+		Stateful::loading_state_version = 1000;
 	} else {
-		int major_version;
-		major_version = atoi (prop->value().c_str()); // grab just the first number before the period
-		if (major_version < 2) {
-			is_old = true;
-		}
-	}
+		int major;
+		int minor;
+		int micro;
 
-	if (is_old) {
+		sscanf (prop->value().c_str(), "%d.%d.%d", &major, &minor, &micro);
+		Stateful::loading_state_version = (major * 1000) + minor;
+	}
+		
+	if (Stateful::loading_state_version < CURRENT_SESSION_FILE_VERSION) {
 
 		sys::path backup_path(_session_dir->root_path());
 
-		backup_path /= snapshot_name + "-1" + statefile_suffix;
+		backup_path /= legalize_for_path (snapshot_name) + "-1" + statefile_suffix;
 
 		// only create a backup once
 		if (sys::exists (backup_path)) {
@@ -826,7 +858,7 @@ Session::load_state (string snapshot_name)
 		}
 
 		info << string_compose (_("Copying old session file %1 to %2\nUse %2 with Ardour versions before 2.0 from now on"),
-					xmlpath.to_string(), backup_path.to_string()) 
+					xmlpath.to_string(), backup_path.to_string())
 		     << endmsg;
 
 		try
@@ -849,15 +881,7 @@ int
 Session::load_options (const XMLNode& node)
 {
 	LocaleGuard lg (X_("POSIX"));
-
 	config.set_variables (node);
-
-	/* now reset MIDI ports because the session can have its own 
-	   MIDI configuration.
-	*/
-
-	setup_midi ();
-
 	return 0;
 }
 
@@ -872,9 +896,9 @@ Session::get_template()
 {
 	/* if we don't disable rec-enable, diskstreams
 	   will believe they need to store their capture
-	   sources in their state node. 
+	   sources in their state node.
 	*/
-	
+
 	disable_record (false);
 
 	return state(false);
@@ -890,11 +914,11 @@ Session::state(bool full_state)
 	char buf[16];
 	snprintf(buf, sizeof(buf), "%d.%d.%d", libardour3_major_version, libardour3_minor_version, libardour3_micro_version);
 	node->add_property("version", string(buf));
-		
+
 	/* store configuration settings */
 
 	if (full_state) {
-	
+
 		node->add_property ("name", _name);
 		snprintf (buf, sizeof (buf), "%" PRId32, _nominal_frame_rate);
 		node->add_property ("sample-rate", buf);
@@ -923,14 +947,14 @@ Session::state(bool full_state)
 				++next;
 				++i;
 			}
-			
+
 			child = node->add_child ("Path");
 			child->add_content (p);
 		}
 	}
 
 	/* save the ID counter */
-	
+
 	snprintf (buf, sizeof (buf), "%" PRIu64, ID::counter());
 	node->add_property ("id-counter", buf);
 
@@ -946,10 +970,10 @@ Session::state(bool full_state)
 		Glib::Mutex::Lock sl (source_lock);
 
 		for (SourceMap::iterator siter = sources.begin(); siter != sources.end(); ++siter) {
-			
+
 			/* Don't save information about non-destructive file sources that are empty */
 			/* FIXME: MIDI breaks if this is made FileSource like it should be... */
-			
+
 			boost::shared_ptr<AudioFileSource> fs;
 			if ((fs = boost::dynamic_pointer_cast<AudioFileSource> (siter->second)) != 0) {
 				if (!fs->destructive()) {
@@ -958,18 +982,18 @@ Session::state(bool full_state)
 					}
 				}
 			}
-			
+
 			child->add_child_nocopy (siter->second->get_state());
 		}
 	}
 
 	child = node->add_child ("Regions");
 
-	if (full_state) { 
+	if (full_state) {
 		Glib::Mutex::Lock rl (region_lock);
 
 		for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-			
+
 			/* only store regions not attached to playlists */
 
 			if (i->second->playlist() == 0) {
@@ -980,7 +1004,7 @@ Session::state(bool full_state)
 
 	child = node->add_child ("DiskStreams");
 
-	{ 
+	{
 		boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
 		for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
 			if (!(*i)->hidden()) {
@@ -1003,7 +1027,7 @@ Session::state(bool full_state)
 		loc.add (end);
 		node->add_child_nocopy (loc.get_state());
 	}
-	
+
 	child = node->add_child ("Bundles");
 	{
 		boost::shared_ptr<BundleList> bundles = _bundles.reader ();
@@ -1018,11 +1042,11 @@ Session::state(bool full_state)
 	child = node->add_child ("Routes");
 	{
 		boost::shared_ptr<RouteList> r = routes.reader ();
-		
+
 		RoutePublicOrderSorter cmp;
 		RouteList public_order (*r);
 		public_order.sort (cmp);
-		
+
 		for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) {
 			if (!(*i)->is_hidden()) {
 				if (full_state) {
@@ -1034,39 +1058,13 @@ Session::state(bool full_state)
 		}
 	}
 
-	
+	playlists->add_state (node, full_state);
+
 	child = node->add_child ("RouteGroups");
 	for (list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) {
 		child->add_child_nocopy ((*i)->get_state());
 	}
 
-	child = node->add_child ("Playlists");
-	for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
-		if (!(*i)->hidden()) {
-			if (!(*i)->empty()) {
-				if (full_state) {
-					child->add_child_nocopy ((*i)->get_state());
-				} else {
-					child->add_child_nocopy ((*i)->get_template());
-				}
-			}
-		}
-	}
-
-	child = node->add_child ("UnusedPlaylists");
-	for (PlaylistList::iterator i = unused_playlists.begin(); i != unused_playlists.end(); ++i) {
-		if (!(*i)->hidden()) {
-			if (!(*i)->empty()) {
-				if (full_state) {
-					child->add_child_nocopy ((*i)->get_state());
-				} else {
-					child->add_child_nocopy ((*i)->get_template());
-				}
-			}
-		}
-	}
-	
-	
 	if (_click_io) {
 		child = node->add_child ("Click");
 		child->add_child_nocopy (_click_io->state (full_state));
@@ -1077,7 +1075,7 @@ Session::state(bool full_state)
 		for (NamedSelectionList::iterator i = named_selections.begin(); i != named_selections.end(); ++i) {
 			if (full_state) {
 				child->add_child_nocopy ((*i)->get_state());
-			} 
+			}
 		}
 	}
 
@@ -1100,7 +1098,7 @@ Session::get_control_protocol_state ()
 }
 
 int
-Session::set_state (const XMLNode& node)
+Session::set_state (const XMLNode& node, int version)
 {
 	XMLNodeList nlist;
 	XMLNode* child;
@@ -1108,12 +1106,16 @@ Session::set_state (const XMLNode& node)
 	int ret = -1;
 
 	_state_of_the_state = StateOfTheState (_state_of_the_state|CannotSave);
-	
+
 	if (node.name() != X_("Session")){
 		fatal << _("programming error: Session: incorrect XML node sent to set_state()") << endmsg;
 		return -1;
 	}
 
+	if ((prop = node.property ("version")) != 0) {
+		version = atoi (prop->value ()) * 1000;
+	}
+
 	if ((prop = node.property ("name")) != 0) {
 		_name = prop->value ();
 	}
@@ -1123,7 +1125,7 @@ Session::set_state (const XMLNode& node)
 		_nominal_frame_rate = atoi (prop->value());
 
 		if (_nominal_frame_rate != _current_frame_rate) {
-			if (AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate)) {
+			if (*AskAboutSampleRateMismatch (_nominal_frame_rate, _current_frame_rate)) {
 				return -1;
 			}
 		}
@@ -1145,7 +1147,7 @@ Session::set_state (const XMLNode& node)
 		ID::init_counter (now);
 	}
 
-	
+
 	IO::disable_connecting ();
 
 	/* Object loading order:
@@ -1182,16 +1184,18 @@ Session::set_state (const XMLNode& node)
 	if (use_config_midi_ports ()) {
 	}
 
-	if ((child = find_named_node (node, "Metadata")) == 0) {
-		warning << _("Session: XML state has no metadata section (2.0 session?)") << endmsg;
-	} else if (_metadata->set_state (*child)) {
-		goto out;
+	if (version >= 3000) {
+		if ((child = find_named_node (node, "Metadata")) == 0) {
+			warning << _("Session: XML state has no metadata section") << endmsg;
+		} else if (_metadata->set_state (*child, version)) {
+			goto out;
+		}
 	}
 
 	if ((child = find_named_node (node, "Locations")) == 0) {
 		error << _("Session: XML state has no locations section") << endmsg;
 		goto out;
-	} else if (_locations.set_state (*child)) {
+	} else if (_locations.set_state (*child, version)) {
 		goto out;
 	}
 
@@ -1238,13 +1242,13 @@ Session::set_state (const XMLNode& node)
 	if ((child = find_named_node (node, "Playlists")) == 0) {
 		error << _("Session: XML state has no playlists section") << endmsg;
 		goto out;
-	} else if (load_playlists (*child)) {
+	} else if (playlists->load (*this, *child)) {
 		goto out;
 	}
 
 	if ((child = find_named_node (node, "UnusedPlaylists")) == 0) {
 		// this is OK
-	} else if (load_unused_playlists (*child)) {
+	} else if (playlists->load_unused (*this, *child)) {
 		goto out;
 	}
 	
@@ -1261,41 +1265,62 @@ Session::set_state (const XMLNode& node)
 		goto out;
 	}
 
-	if ((child = find_named_node (node, "Bundles")) == 0) {
-		warning << _("Session: XML state has no bundles section (2.0 session?)") << endmsg;
-		//goto out;
-	} else {
-		/* We can't load Bundles yet as they need to be able
-		   to convert from port names to Port objects, which can't happen until
-		   later */
-		_bundle_xml_node = new XMLNode (*child);
+	if (version >= 3000) {
+		if ((child = find_named_node (node, "Bundles")) == 0) {
+			warning << _("Session: XML state has no bundles section") << endmsg;
+			//goto out;
+		} else {
+			/* We can't load Bundles yet as they need to be able
+			   to convert from port names to Port objects, which can't happen until
+			   later */
+			_bundle_xml_node = new XMLNode (*child);
+		}
 	}
 	
-	if ((child = find_named_node (node, "RouteGroups")) == 0) {
-		error << _("Session: XML state has no route groups section") << endmsg;
-		goto out;
-	} else if (load_route_groups (*child)) {
-		goto out;
-	}
-
 	if ((child = find_named_node (node, "TempoMap")) == 0) {
 		error << _("Session: XML state has no Tempo Map section") << endmsg;
 		goto out;
-	} else if (_tempo_map->set_state (*child)) {
+	} else if (_tempo_map->set_state (*child, version)) {
 		goto out;
 	}
 
 	if ((child = find_named_node (node, "Routes")) == 0) {
 		error << _("Session: XML state has no routes section") << endmsg;
 		goto out;
-	} else if (load_routes (*child)) {
+	} else if (load_routes (*child, version)) {
 		goto out;
 	}
 
+	if (version >= 3000) {
+		
+		if ((child = find_named_node (node, "RouteGroups")) == 0) {
+			error << _("Session: XML state has no route groups section") << endmsg;
+			goto out;
+		} else if (load_route_groups (*child, version)) {
+			goto out;
+		}
+		
+	} else if (version < 3000) {
+		
+		if ((child = find_named_node (node, "EditGroups")) == 0) {
+			error << _("Session: XML state has no edit groups section") << endmsg;
+			goto out;
+		} else if (load_route_groups (*child, version)) {
+			goto out;
+		}
+
+		if ((child = find_named_node (node, "MixGroups")) == 0) {
+			error << _("Session: XML state has no mix groups section") << endmsg;
+			goto out;
+		} else if (load_route_groups (*child, version)) {
+			goto out;
+		}
+	}
+
 	if ((child = find_named_node (node, "Click")) == 0) {
 		warning << _("Session: XML state has no click section") << endmsg;
 	} else if (_click_io) {
-		_click_io->set_state (*child);
+		_click_io->set_state (*child, version);
 	}
 
 	if ((child = find_named_node (node, "ControlProtocols")) != 0) {
@@ -1313,7 +1338,7 @@ Session::set_state (const XMLNode& node)
 }
 
 int
-Session::load_routes (const XMLNode& node)
+Session::load_routes (const XMLNode& node, int version)
 {
 	XMLNodeList nlist;
 	XMLNodeConstIterator niter;
@@ -1325,7 +1350,7 @@ Session::load_routes (const XMLNode& node)
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
-		boost::shared_ptr<Route> route (XMLRouteFactory (**niter));
+		boost::shared_ptr<Route> route (XMLRouteFactory (**niter, version));
 
 		if (route == 0) {
 			error << _("Session: cannot create Route from XML description.") << endmsg;
@@ -1343,35 +1368,40 @@ Session::load_routes (const XMLNode& node)
 }
 
 boost::shared_ptr<Route>
-Session::XMLRouteFactory (const XMLNode& node)
+Session::XMLRouteFactory (const XMLNode& node, int version)
 {
 	if (node.name() != "Route") {
 		return boost::shared_ptr<Route> ((Route*) 0);
 	}
 
 	bool has_diskstream = (node.property ("diskstream") != 0 || node.property ("diskstream-id") != 0);
-	
+
 	DataType type = DataType::AUDIO;
 	const XMLProperty* prop = node.property("default-type");
+	boost::shared_ptr<Route> ret;
 
 	if (prop) {
 		type = DataType(prop->value());
-	} 
-	
+	}
+
 	assert(type != DataType::NIL);
 
 	if (has_diskstream) {
 		if (type == DataType::AUDIO) {
-			boost::shared_ptr<Route> ret (new AudioTrack (*this, node));
-			return ret;
+			AudioTrack* at = new AudioTrack (*this, node, version);
+			boost_debug_shared_ptr_mark_interesting (at, "Track");
+			ret.reset (at);
+			
 		} else {
-			boost::shared_ptr<Route> ret (new MidiTrack (*this, node));
-			return ret;
+			ret.reset (new MidiTrack (*this, node, version));
 		}
 	} else {
-		boost::shared_ptr<Route> ret (new Route (*this, node));
-		return ret;
+		Route* rt = new Route (*this, node);
+		boost_debug_shared_ptr_mark_interesting (rt, "Route");
+		ret.reset (rt);
 	}
+
+	return ret;
 }
 
 int
@@ -1407,17 +1437,17 @@ Session::XMLRegionFactory (const XMLNode& node, bool full)
 	const XMLProperty* type = node.property("type");
 
 	try {
-	
+
 	if ( !type || type->value() == "audio" ) {
 
 		return boost::shared_ptr<Region>(XMLAudioRegionFactory (node, full));
-	
+
 	} else if (type->value() == "midi") {
-		
+
 		return boost::shared_ptr<Region>(XMLMidiRegionFactory (node, full));
 
 	}
-	
+
 	} catch (failed_constructor& err) {
 		return boost::shared_ptr<Region> ();
 	}
@@ -1426,7 +1456,7 @@ Session::XMLRegionFactory (const XMLNode& node, bool full)
 }
 
 boost::shared_ptr<AudioRegion>
-Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
+Session::XMLAudioRegionFactory (const XMLNode& node, bool /*full*/)
 {
 	const XMLProperty* prop;
 	boost::shared_ptr<Source> source;
@@ -1435,7 +1465,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
 	SourceList master_sources;
 	uint32_t nchans = 1;
 	char buf[128];
-	
+
 	if (node.name() != X_("Region")) {
 		return boost::shared_ptr<AudioRegion>();
 	}
@@ -1448,7 +1478,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
 		cerr << "no name for this region\n";
 		abort ();
 	}
-	
+
 	if ((prop = node.property (X_("source-0"))) == 0) {
 		if ((prop = node.property ("source")) == 0) {
 			error << _("Session: XMLNode describing a AudioRegion is incomplete (no source)") << endmsg;
@@ -1462,7 +1492,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
 		error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), s_id) << endmsg;
 		return boost::shared_ptr<AudioRegion>();
 	}
-	
+
 	as = boost::dynamic_pointer_cast<AudioSource>(source);
 	if (!as) {
 		error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), s_id) << endmsg;
@@ -1476,14 +1506,14 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
 	for (uint32_t n=1; n < nchans; ++n) {
 		snprintf (buf, sizeof(buf), X_("source-%d"), n);
 		if ((prop = node.property (buf)) != 0) {
-			
+
 			PBD::ID id2 (prop->value());
-			
+
 			if ((source = source_by_id (id2)) == 0) {
 				error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), id2) << endmsg;
 				return boost::shared_ptr<AudioRegion>();
 			}
-			
+
 			as = boost::dynamic_pointer_cast<AudioSource>(source);
 			if (!as) {
 				error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), id2) << endmsg;
@@ -1496,14 +1526,14 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
 	for (uint32_t n = 0; n < nchans; ++n) {
 		snprintf (buf, sizeof(buf), X_("master-source-%d"), n);
 		if ((prop = node.property (buf)) != 0) {
-			
+
 			PBD::ID id2 (prop->value());
-			
+
 			if ((source = source_by_id (id2)) == 0) {
 				error << string_compose(_("Session: XMLNode describing a AudioRegion references an unknown source id =%1"), id2) << endmsg;
 				return boost::shared_ptr<AudioRegion>();
 			}
-			
+
 			as = boost::dynamic_pointer_cast<AudioSource>(source);
 			if (!as) {
 				error << string_compose(_("Session: XMLNode describing a AudioRegion references a non-audio source id =%1"), id2) << endmsg;
@@ -1536,7 +1566,7 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
 		}
 
 		return region;
-						       
+
 	}
 
 	catch (failed_constructor& err) {
@@ -1545,14 +1575,14 @@ Session::XMLAudioRegionFactory (const XMLNode& node, bool full)
 }
 
 boost::shared_ptr<MidiRegion>
-Session::XMLMidiRegionFactory (const XMLNode& node, bool full)
+Session::XMLMidiRegionFactory (const XMLNode& node, bool /*full*/)
 {
 	const XMLProperty* prop;
 	boost::shared_ptr<Source> source;
 	boost::shared_ptr<MidiSource> ms;
 	SourceList sources;
 	uint32_t nchans = 1;
-	
+
 	if (node.name() != X_("Region")) {
 		return boost::shared_ptr<MidiRegion>();
 	}
@@ -1560,7 +1590,7 @@ Session::XMLMidiRegionFactory (const XMLNode& node, bool full)
 	if ((prop = node.property (X_("channels"))) != 0) {
 		nchans = atoi (prop->value().c_str());
 	}
-	
+
 	if ((prop = node.property ("name")) == 0) {
 		cerr << "no name for this region\n";
 		abort ();
@@ -1639,7 +1669,7 @@ Session::path_from_region_name (DataType type, string name, string identifier)
 
 	for (n = 0; n < 999999; ++n) {
 		if (identifier.length()) {
-			snprintf (buf, sizeof(buf), "%s%s%" PRIu32 "%s", name.c_str(), 
+			snprintf (buf, sizeof(buf), "%s%s%" PRIu32 "%s", name.c_str(),
 				  identifier.c_str(), n, ext.c_str());
 		} else {
 			snprintf (buf, sizeof(buf), "%s-%" PRIu32 "%s", name.c_str(),
@@ -1659,7 +1689,7 @@ Session::path_from_region_name (DataType type, string name, string identifier)
 
 	return "";
 }
-	
+
 
 int
 Session::load_sources (const XMLNode& node)
@@ -1747,7 +1777,7 @@ Session::save_template (string template_name)
 }
 
 int
-Session::rename_template (string old_name, string new_name) 
+Session::rename_template (string old_name, string new_name)
 {
 	sys::path old_path (user_template_directory());
 	old_path /= old_name + template_suffix;
@@ -1770,7 +1800,7 @@ Session::rename_template (string old_name, string new_name)
 }
 
 int
-Session::delete_template (string name) 
+Session::delete_template (string name)
 {
 	sys::path path = user_template_directory();
 	path /= name + template_suffix;
@@ -1795,7 +1825,7 @@ Session::refresh_disk_space ()
 	/* get freespace on every FS that is part of the session path */
 
 	_total_free_4k_blocks = 0;
-	
+
 	for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
 		statfs ((*i).path.c_str(), &statfsbuf);
 
@@ -1820,8 +1850,8 @@ Session::get_best_session_directory_for_new_source ()
 	}
 
 	/* OK, here's the algorithm we're following here:
-	   
-	We want to select which directory to use for 
+
+	We want to select which directory to use for
 	the next file source to be created. Ideally,
 	we'd like to use a round-robin process so as to
 	get maximum performance benefits from splitting
@@ -1840,15 +1870,15 @@ Session::get_best_session_directory_for_new_source ()
 
 	So, we use a user-configurable space threshold. If
 	there are at least 2 filesystems with more than this
-	much space available, we use RR selection between them. 
+	much space available, we use RR selection between them.
 	If not, then we pick the filesystem with the most space.
 
 	This gets a good balance between the two
-	approaches.  
+	approaches.
 	*/
-	
+
 	refresh_disk_space ();
-	
+
 	int free_enough = 0;
 
 	for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
@@ -1884,13 +1914,13 @@ Session::get_best_session_directory_for_new_source ()
 		/* pick FS with the most freespace (and that
 		   seems to actually work ...)
 		*/
-		
+
 		vector<space_and_path> sorted;
 		space_and_path_ascending_cmp cmp;
 
 		sorted = session_dirs;
 		sort (sorted.begin(), sorted.end(), cmp);
-		
+
 		for (i = sorted.begin(); i != sorted.end(); ++i) {
 			if (create_session_directory ((*i).path)) {
 				result = (*i).path;
@@ -1903,65 +1933,6 @@ Session::get_best_session_directory_for_new_source ()
 	return result;
 }
 
-int
-Session::load_playlists (const XMLNode& node)
-{
-	XMLNodeList nlist;
-	XMLNodeConstIterator niter;
-	boost::shared_ptr<Playlist> playlist;
-
-	nlist = node.children();
-
-	set_dirty();
-
-	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		
-		if ((playlist = XMLPlaylistFactory (**niter)) == 0) {
-			error << _("Session: cannot create Playlist from XML description.") << endmsg;
-		}
-	}
-
-	return 0;
-}
-
-int
-Session::load_unused_playlists (const XMLNode& node)
-{
-	XMLNodeList nlist;
-	XMLNodeConstIterator niter;
-	boost::shared_ptr<Playlist> playlist;
-
-	nlist = node.children();
-
-	set_dirty();
-
-	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		
-		if ((playlist = XMLPlaylistFactory (**niter)) == 0) {
-			error << _("Session: cannot create Playlist from XML description.") << endmsg;
-			continue;
-		}
-
-		// now manually untrack it
-
-		track_playlist (false, boost::weak_ptr<Playlist> (playlist));
-	}
-
-	return 0;
-}
-
-boost::shared_ptr<Playlist>
-Session::XMLPlaylistFactory (const XMLNode& node)
-{
-	try {
-		return PlaylistFactory::create (*this, node);
-	}
-
-	catch (failed_constructor& err) {
-		return boost::shared_ptr<Playlist>();
-	}
-}
-
 int
 Session::load_named_selections (const XMLNode& node)
 {
@@ -1974,7 +1945,7 @@ Session::load_named_selections (const XMLNode& node)
 	set_dirty();
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		
+
 		if ((ns = XMLNamedSelectionFactory (**niter)) == 0) {
 			error << _("Session: cannot create Named Selection from XML description.") << endmsg;
 		}
@@ -2010,43 +1981,56 @@ Session::analysis_dir () const
 int
 Session::load_bundles (XMLNode const & node)
 {
- 	XMLNodeList nlist = node.children();
- 	XMLNodeConstIterator niter;
+	XMLNodeList nlist = node.children();
+	XMLNodeConstIterator niter;
 
- 	set_dirty();
+	set_dirty();
 
- 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
- 		if ((*niter)->name() == "InputBundle") {
+	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+		if ((*niter)->name() == "InputBundle") {
 			add_bundle (boost::shared_ptr<UserBundle> (new UserBundle (**niter, true)));
- 		} else if ((*niter)->name() == "OutputBundle") {
- 			add_bundle (boost::shared_ptr<UserBundle> (new UserBundle (**niter, false)));
- 		} else {
- 			error << string_compose(_("Unknown node \"%1\" found in Bundles list from state file"), (*niter)->name()) << endmsg;
- 			return -1;
- 		}
- 	}
+		} else if ((*niter)->name() == "OutputBundle") {
+			add_bundle (boost::shared_ptr<UserBundle> (new UserBundle (**niter, false)));
+		} else {
+			error << string_compose(_("Unknown node \"%1\" found in Bundles list from state file"), (*niter)->name()) << endmsg;
+			return -1;
+		}
+	}
 
 	return 0;
-}				
+}
 
 int
-Session::load_route_groups (const XMLNode& node)
+Session::load_route_groups (const XMLNode& node, int version)
 {
 	XMLNodeList nlist = node.children();
 	XMLNodeConstIterator niter;
 
 	set_dirty ();
 
-	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		if ((*niter)->name() == "RouteGroup") {
-			RouteGroup* rg = new RouteGroup (*this, "");
-			add_route_group (rg);
-			rg->set_state (**niter);
+	if (version >= 3000) {
+		
+		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+			if ((*niter)->name() == "RouteGroup") {
+				RouteGroup* rg = new RouteGroup (*this, "");
+				add_route_group (rg);
+				rg->set_state (**niter, version);
+			}
+		}
+
+	} else if (version < 3000) {
+
+		for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+			if ((*niter)->name() == "EditGroup" || (*niter)->name() == "MixGroup") {
+				RouteGroup* rg = new RouteGroup (*this, "");
+				add_route_group (rg);
+				rg->set_state (**niter, version);
+			}
 		}
 	}
-	
+
 	return 0;
-}				
+}
 
 void
 Session::auto_save()
@@ -2055,7 +2039,7 @@ Session::auto_save()
 }
 
 static bool
-state_file_filter (const string &str, void *arg)
+state_file_filter (const string &str, void */*arg*/)
 {
 	return (str.length() > strlen(statefile_suffix) &&
 		str.find (statefile_suffix) == (str.length() - strlen (statefile_suffix)));
@@ -2071,12 +2055,12 @@ static string*
 remove_end(string* state)
 {
 	string statename(*state);
-	
+
 	string::size_type start,end;
 	if ((start = statename.find_last_of ('/')) != string::npos) {
 		statename = statename.substr (start+1);
 	}
-		
+
 	if ((end = statename.rfind(".ardour")) == string::npos) {
 		end = statename.length();
 	}
@@ -2085,16 +2069,16 @@ remove_end(string* state)
 }
 
 vector<string *> *
-Session::possible_states (string path) 
+Session::possible_states (string path)
 {
 	PathScanner scanner;
 	vector<string*>* states = scanner (path, state_file_filter, 0, false, false);
-	
+
 	transform(states->begin(), states->end(), states->begin(), remove_end);
-	
+
 	string_cmp cmp;
 	sort (states->begin(), states->end(), cmp);
-	
+
 	return states;
 }
 
@@ -2118,15 +2102,14 @@ Session::remove_route_group (RouteGroup& rg)
 	list<RouteGroup*>::iterator i;
 
 	if ((i = find (_route_groups.begin(), _route_groups.end(), &rg)) != _route_groups.end()) {
-		(*i)->apply (&Route::drop_route_group, this);
 		_route_groups.erase (i);
+		delete &rg;
+
 		route_group_removed (); /* EMIT SIGNAL */
 	}
 
-	delete &rg;
 }
 
-
 RouteGroup *
 Session::route_group_by_name (string name)
 {
@@ -2140,15 +2123,34 @@ Session::route_group_by_name (string name)
 	return 0;
 }
 
+UndoTransaction*
+Session::start_reversible_command (const string& name)
+{
+	UndoTransaction* trans = new UndoTransaction();
+	trans->set_name(name);
+	return trans;
+}
+
+void
+Session::finish_reversible_command (UndoTransaction& ut)
+{
+	struct timeval now;
+	gettimeofday(&now, 0);
+	ut.set_timestamp(now);
+	_history.add (&ut);
+}
+
 void
 Session::begin_reversible_command(const string& name)
 {
 	UndoTransaction* trans = new UndoTransaction();
 	trans->set_name(name);
+
 	if (!_current_trans.empty()) {
-		_current_trans.top()->add_command(trans);
+		_current_trans.top()->add_command (trans);
+	} else {
+		_current_trans.push(trans);
 	}
-	_current_trans.push(trans);
 }
 
 void
@@ -2173,105 +2175,19 @@ Session::commit_reversible_command(Command *cmd)
 	_current_trans.pop();
 }
 
-Session::GlobalRouteBooleanState 
-Session::get_global_route_boolean (bool (Route::*method)(void) const)
-{
-	GlobalRouteBooleanState s;
-	boost::shared_ptr<RouteList> r = routes.reader ();
-
-	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-		if (!(*i)->is_hidden()) {
-			RouteBooleanState v;
-			
-			v.first =* i;
-			Route* r = (*i).get();
-			v.second = (r->*method)();
-			
-			s.push_back (v);
-		}
-	}
-
-	return s;
-}
-
-Session::GlobalRouteMeterState
-Session::get_global_route_metering ()
-{
-	GlobalRouteMeterState s;
-	boost::shared_ptr<RouteList> r = routes.reader ();
-
-	for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-		if (!(*i)->is_hidden()) {
-			RouteMeterState v;
-			
-			v.first =* i;
-			v.second = (*i)->meter_point();
-			
-			s.push_back (v);
-		}
-	}
-
-	return s;
-}
-
-void
-Session::set_global_route_metering (GlobalRouteMeterState s, void* arg) 
-{
-	for (GlobalRouteMeterState::iterator i = s.begin(); i != s.end(); ++i) {
-
-		boost::shared_ptr<Route> r = (i->first.lock());
-
-		if (r) {
-			r->set_meter_point (i->second, arg);
-		}
-	}
-}
-
-void
-Session::set_global_route_boolean (GlobalRouteBooleanState s, void (Route::*method)(bool, void*), void* arg)
-{
-	for (GlobalRouteBooleanState::iterator i = s.begin(); i != s.end(); ++i) {
-
-		boost::shared_ptr<Route> r = (i->first.lock());
-
-		if (r) {
-			Route* rp = r.get();
-			(rp->*method) (i->second, arg);
-		}
-	}
-}
-
-void
-Session::set_global_mute (GlobalRouteBooleanState s, void* src)
-{
-	set_global_route_boolean (s, &Route::set_mute, src);
-}
-
-void
-Session::set_global_solo (GlobalRouteBooleanState s, void* src)
-{
-	set_global_route_boolean (s, &Route::set_solo, src);
-}
-
-void
-Session::set_global_record_enable (GlobalRouteBooleanState s, void* src)
-{
-	set_global_route_boolean (s, &Route::set_record_enable, src);
-}
-
 static bool
-accept_all_non_peak_files (const string& path, void *arg)
+accept_all_non_peak_files (const string& path, void */*arg*/)
 {
 	return (path.length() > 5 && path.find (peakfile_suffix) != (path.length() - 5));
 }
 
 static bool
-accept_all_state_files (const string& path, void *arg)
+accept_all_state_files (const string& path, void */*arg*/)
 {
 	return (path.length() > 7 && path.find (".ardour") == (path.length() - 7));
 }
 
-int 
+int
 Session::find_all_sources (string path, set<string>& result)
 {
 	XMLTree tree;
@@ -2293,7 +2209,7 @@ Session::find_all_sources (string path, set<string>& result)
 	set_dirty();
 
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-		
+
 		XMLProperty* prop;
 
 		if ((prop = (*niter)->property (X_("type"))) == 0) {
@@ -2310,7 +2226,7 @@ Session::find_all_sources (string path, set<string>& result)
 			/* external file, ignore */
 			continue;
 		}
-		
+
 		Glib::ustring found_path;
 		bool is_new;
 		uint16_t chan;
@@ -2340,14 +2256,14 @@ Session::find_all_sources_across_snapshots (set<string>& result, bool exclude_th
 	}
 
 	state_files = scanner (ripped, accept_all_state_files, (void *) 0, false, true);
-	
+
 	if (state_files == 0) {
 		/* impossible! */
 		return 0;
 	}
 
 	this_snapshot_path = _path;
-	this_snapshot_path += _current_snapshot_name;
+	this_snapshot_path += legalize_for_path (_current_snapshot_name);
 	this_snapshot_path += statefile_suffix;
 
 	for (vector<string*>::iterator i = state_files->begin(); i != state_files->end(); ++i) {
@@ -2369,17 +2285,22 @@ struct RegionCounter {
     AudioSourceList::iterator iter;
     boost::shared_ptr<Region> region;
     uint32_t count;
-    
+
     RegionCounter() : count (0) {}
 };
 
 int
-Session::cleanup_sources (Session::cleanup_report& rep)
+Session::ask_about_playlist_deletion (boost::shared_ptr<Playlist> p)
+{
+	return *AskAboutPlaylistDeletion (p);
+}
+
+int
+Session::cleanup_sources (CleanupReport& rep)
 {
 	// FIXME: needs adaptation to midi
-	
+
 	vector<boost::shared_ptr<Source> > dead_sources;
-	vector<boost::shared_ptr<Playlist> > playlists_tbd;
 	PathScanner scanner;
 	string sound_path;
 	vector<space_and_path>::iterator i;
@@ -2390,48 +2311,23 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 	bool used;
 	string spath;
 	int ret = -1;
-		
+
 	_state_of_the_state = (StateOfTheState) (_state_of_the_state | InCleanup);
 
-	
 	/* step 1: consider deleting all unused playlists */
-
-	for (PlaylistList::iterator x = unused_playlists.begin(); x != unused_playlists.end(); ++x) {
-		int status;
-
-		status = AskAboutPlaylistDeletion (*x);
-
-		switch (status) {
-		case -1:
-			ret = 0;
-			goto out;
-			break;
-
-		case 0:
-			playlists_tbd.push_back (*x);
-			break;
-
-		default:
-			/* leave it alone */
-			break;
-		}
-	}
-
-	/* now delete any that were marked for deletion */
-
-	for (vector<boost::shared_ptr<Playlist> >::iterator x = playlists_tbd.begin(); x != playlists_tbd.end(); ++x) {
-		(*x)->drop_references ();
+	
+	if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) {
+		ret = 0;
+		goto out;
 	}
 
-	playlists_tbd.clear ();
-
 	/* step 2: find all un-used sources */
 
 	rep.paths.clear ();
 	rep.space = 0;
 
 	for (SourceMap::iterator i = sources.begin(); i != sources.end(); ) {
-		
+
 		SourceMap::iterator tmp;
 
 		tmp = i;
@@ -2441,10 +2337,10 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 		   capture files.
 		*/
 
- 		if (!i->second->used() && i->second->length(i->second->timeline_position()) > 0) {
+		if (!playlists->source_use_count(i->second) && i->second->length(i->second->timeline_position()) > 0) {
 			dead_sources.push_back (i->second);
-			i->second->GoingAway();
-		} 
+			i->second->drop_references ();
+		}
 
 		i = tmp;
 	}
@@ -2466,7 +2362,7 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 		i = nexti;
 	}
 
-	/* now do the same thing for the files that ended up in the sounds dir(s) 
+	/* now do the same thing for the files that ended up in the sounds dir(s)
 	   but are not referenced as sources in any snapshot.
 	*/
 
@@ -2480,23 +2376,23 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 	   state file on disk still references sources we may have already
 	   dropped.
 	*/
-	
+
 	find_all_sources_across_snapshots (all_sources, true);
 
 	/*  add our current source list
 	 */
-	
+
 	for (SourceMap::iterator i = sources.begin(); i != sources.end(); ++i) {
 		boost::shared_ptr<FileSource> fs;
-		
+
 		if ((fs = boost::dynamic_pointer_cast<FileSource> (i->second)) != 0) {
 			all_sources.insert (fs->path());
-		} 
+		}
 	}
 
 	char tmppath1[PATH_MAX+1];
 	char tmppath2[PATH_MAX+1];
-	
+
 	for (vector<string*>::iterator x = soundfiles->begin(); x != soundfiles->end(); ++x) {
 
 		used = false;
@@ -2529,7 +2425,7 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 		}
 
 		string newpath;
-		
+
 		/* don't move the file across filesystems, just
 		   stick it in the `dead_sound_dir_name' directory
 		   on whichever filesystem it was already on.
@@ -2539,14 +2435,14 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 
 			/* old school, go up 1 level */
 
-			newpath = Glib::path_get_dirname (*x);      // "sounds" 
+			newpath = Glib::path_get_dirname (*x);      // "sounds"
 			newpath = Glib::path_get_dirname (newpath); // "session-name"
 
 		} else {
 
 			/* new school, go up 4 levels */
-			
-			newpath = Glib::path_get_dirname (*x);      // "audiofiles" 
+
+			newpath = Glib::path_get_dirname (*x);      // "audiofiles"
 			newpath = Glib::path_get_dirname (newpath); // "session-name"
 			newpath = Glib::path_get_dirname (newpath); // "interchange"
 			newpath = Glib::path_get_dirname (newpath); // "session-dir"
@@ -2562,15 +2458,15 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 
 		newpath += '/';
 		newpath += Glib::path_get_basename ((*x));
-		
+
 		if (access (newpath.c_str(), F_OK) == 0) {
-			
+
 			/* the new path already exists, try versioning */
-			
+
 			char buf[PATH_MAX+1];
 			int version = 1;
 			string newpath_v;
-			
+
 			snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), version);
 			newpath_v = buf;
 
@@ -2578,7 +2474,7 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 				snprintf (buf, sizeof (buf), "%s.%d", newpath.c_str(), ++version);
 				newpath_v = buf;
 			}
-			
+
 			if (version == 999) {
 				error << string_compose (_("there are already 1000 files with names like %1; versioning discontinued"),
 						  newpath)
@@ -2586,11 +2482,11 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 			} else {
 				newpath = newpath_v;
 			}
-			
+
 		} else {
-			
+
 			/* it doesn't exist, or we can't read it or something */
-			
+
 		}
 
 		if (::rename ((*x).c_str(), newpath.c_str()) != 0) {
@@ -2627,7 +2523,7 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 	/* save state so we don't end up a session file
 	   referring to non-existent sources.
 	*/
-	
+
 	save_state ("");
 
   out:
@@ -2637,10 +2533,10 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 }
 
 int
-Session::cleanup_trash_sources (Session::cleanup_report& rep)
+Session::cleanup_trash_sources (CleanupReport& rep)
 {
 	// FIXME: needs adaptation for MIDI
-	
+
 	vector<space_and_path>::iterator i;
 	string dead_sound_dir;
 	struct dirent* dentry;
@@ -2651,7 +2547,7 @@ Session::cleanup_trash_sources (Session::cleanup_report& rep)
 	rep.space = 0;
 
 	for (i = session_dirs.begin(); i != session_dirs.end(); ++i) {
-		
+
 		dead_sound_dir = (*i).path;
 		dead_sound_dir += dead_sound_dir_name;
 
@@ -2662,8 +2558,8 @@ Session::cleanup_trash_sources (Session::cleanup_report& rep)
 		while ((dentry = readdir (dead)) != 0) {
 
 			/* avoid '.' and '..' */
-			
-			if ((dentry->d_name[0] == '.' && dentry->d_name[1] == '\0') || 
+
+			if ((dentry->d_name[0] == '.' && dentry->d_name[1] == '\0') ||
 			    (dentry->d_name[2] == '\0' && dentry->d_name[0] == '.' && dentry->d_name[1] == '.')) {
 				continue;
 			}
@@ -2693,7 +2589,7 @@ Session::cleanup_trash_sources (Session::cleanup_report& rep)
 		}
 
 		closedir (dead);
-		
+
 	}
 
 	return 0;
@@ -2717,7 +2613,7 @@ void
 Session::set_clean ()
 {
 	bool was_dirty = dirty();
-	
+
 	_state_of_the_state = Clean;
 
 
@@ -2750,7 +2646,7 @@ Session::add_controllable (boost::shared_ptr<Controllable> c)
 	Glib::Mutex::Lock lm (controllables_lock);
 	controllables.insert (c);
 }
-	
+
 struct null_deleter { void operator()(void const *) const {} };
 
 void
@@ -2762,19 +2658,18 @@ Session::remove_controllable (Controllable* c)
 
 	Glib::Mutex::Lock lm (controllables_lock);
 
-	Controllables::iterator x = controllables.find(
-		 boost::shared_ptr<Controllable>(c, null_deleter()));
+	Controllables::iterator x = controllables.find (boost::shared_ptr<Controllable>(c, null_deleter()));
 
 	if (x != controllables.end()) {
 		controllables.erase (x);
 	}
-}	
+}
 
 boost::shared_ptr<Controllable>
 Session::controllable_by_id (const PBD::ID& id)
 {
 	Glib::Mutex::Lock lm (controllables_lock);
-	
+
 	for (Controllables::iterator i = controllables.begin(); i != controllables.end(); ++i) {
 		if ((*i)->id() == id) {
 			return *i;
@@ -2784,10 +2679,102 @@ Session::controllable_by_id (const PBD::ID& id)
 	return boost::shared_ptr<Controllable>();
 }
 
-void 
+boost::shared_ptr<Controllable>
+Session::controllable_by_rid_and_name (uint32_t rid, const char* const what)
+{
+	boost::shared_ptr<Controllable> c;
+	boost::shared_ptr<Route> r = route_by_remote_id (rid);
+	
+	if (!r) {
+		return c;
+	}
+
+	if (strncmp (what, "gain", 4) == 0) {
+		c = r->gain_control ();
+	} else if (strncmp (what, "solo", 4) == 0) {
+		c = r->solo_control();
+	} else if (strncmp (what, "mute", 4) == 0) {
+		c = r->mute_control();
+	} else if (strncmp (what, "pan", 3) == 0) {
+
+		/* XXX pan control */
+
+	} else if (strncmp (what, "plugin", 6) == 0) {
+
+		/* parse to identify plugin & parameter */
+
+		uint32_t plugin;
+		uint32_t parameter_index;
+
+		if (sscanf (what, "plugin%" PRIu32 ":%" PRIu32,  &plugin, &parameter_index) == 2) {
+
+			/* revert to zero based counting */
+			
+			if (plugin > 0) {
+				--plugin;
+			}
+			
+			if (parameter_index > 0) {
+				--parameter_index;
+			}
+
+			boost::shared_ptr<Processor> p = r->nth_plugin (plugin);
+
+			if (p) {
+				c = boost::dynamic_pointer_cast<ARDOUR::AutomationControl>(
+					p->data().control(Evoral::Parameter(PluginAutomation, 0, parameter_index)));
+			}
+		}
+
+	} else if (strncmp (what, "send", 4) == 0) {
+
+		/* parse to identify send & property */
+
+		uint32_t send;
+		char property[64];
+
+		if (sscanf (what, "send%" PRIu32 ":%63s", &send, property) == 2) {
+
+			/* revert to zero-based counting */
+			
+			if (send > 0) {
+				--send;
+			}
+
+			boost::shared_ptr<Processor> p = r->nth_send (send);
+
+			if (p) {
+				boost::shared_ptr<Send> s = boost::dynamic_pointer_cast<Send>(p);
+
+				if (strcmp (property, "gain") == 0) {
+					boost::shared_ptr<Amp> a = s->amp();
+					if (a) {
+						c = s->amp()->gain_control();
+					}
+				}
+				/* XXX pan control */
+			}
+		}
+		
+	} else if (strncmp (what, "recenable", 9) == 0) {
+
+		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(r);
+
+		if (t) {
+			c = t->rec_enable_control ();
+		}
+	}
+
+	return c;
+}
+
+void
 Session::add_instant_xml (XMLNode& node, bool write_to_config)
 {
-	Stateful::add_instant_xml (node, _path);
+	if (_writable) {
+		Stateful::add_instant_xml (node, _path);
+	}
+
 	if (write_to_config) {
 		Config->add_instant_xml (node);
 	}
@@ -2799,18 +2786,22 @@ Session::instant_xml (const string& node_name)
 	return Stateful::instant_xml (node_name, _path);
 }
 
-int 
+int
 Session::save_history (string snapshot_name)
 {
 	XMLTree tree;
-	
- 	if (snapshot_name.empty()) {
+
+	if (!_writable) {
+	        return 0;
+	}
+
+	if (snapshot_name.empty()) {
 		snapshot_name = _current_snapshot_name;
 	}
-  
- 	const string history_filename = snapshot_name + history_suffix;
+
+	const string history_filename = legalize_for_path (snapshot_name) + history_suffix;
 	const string backup_filename = history_filename + backup_suffix;
- 	const sys::path xml_path = _session_dir->root_path() / history_filename;
+	const sys::path xml_path = _session_dir->root_path() / history_filename;
 	const sys::path backup_path = _session_dir->root_path() / backup_filename;
 
 	if (sys::exists (xml_path)) {
@@ -2823,14 +2814,13 @@ Session::save_history (string snapshot_name)
 			error << _("could not backup old history file, current history not saved") << endmsg;
 			return -1;
 		}
- 	}
-
+	}
 
 	if (!Config->get_save_history() || Config->get_saved_history_depth() < 0) {
 		return 0;
 	}
 
- 	tree.set_root (&_history.get_state (Config->get_saved_history_depth()));
+	tree.set_root (&_history.get_state (Config->get_saved_history_depth()));
 
 	if (!tree.write (xml_path.to_string()))
 	{
@@ -2862,10 +2852,10 @@ Session::restore_history (string snapshot_name)
 		snapshot_name = _current_snapshot_name;
 	}
 
-	const string xml_filename = snapshot_name + history_suffix;
+	const string xml_filename = legalize_for_path (snapshot_name) + history_suffix;
 	const sys::path xml_path = _session_dir->root_path() / xml_filename;
 
-    cerr << "Loading history from " << xml_path.to_string() << endmsg;
+	info << "Loading history from " << xml_path.to_string() << endmsg;
 
 	if (!sys::exists (xml_path)) {
 		info << string_compose (_("%1: no history file \"%2\" for this session."),
@@ -2882,57 +2872,62 @@ Session::restore_history (string snapshot_name)
 	// replace history
 	_history.clear();
 
-    for (XMLNodeConstIterator it  = tree.root()->children().begin(); it != tree.root()->children().end(); it++) {
-	    
-	    XMLNode *t = *it;
-	    UndoTransaction* ut = new UndoTransaction ();
-	    struct timeval tv;
-	    
-	    ut->set_name(t->property("name")->value());
-	    stringstream ss(t->property("tv-sec")->value());
-	    ss >> tv.tv_sec;
-	    ss.str(t->property("tv-usec")->value());
-	    ss >> tv.tv_usec;
-	    ut->set_timestamp(tv);
-	    
-	    for (XMLNodeConstIterator child_it  = t->children().begin();
+	for (XMLNodeConstIterator it  = tree.root()->children().begin(); it != tree.root()->children().end(); it++) {
+
+		XMLNode *t = *it;
+		UndoTransaction* ut = new UndoTransaction ();
+		struct timeval tv;
+
+		ut->set_name(t->property("name")->value());
+		stringstream ss(t->property("tv-sec")->value());
+		ss >> tv.tv_sec;
+		ss.str(t->property("tv-usec")->value());
+		ss >> tv.tv_usec;
+		ut->set_timestamp(tv);
+
+		for (XMLNodeConstIterator child_it  = t->children().begin();
 				child_it != t->children().end(); child_it++)
-	    {
-		    XMLNode *n = *child_it;
-		    Command *c;
-	
-		    if (n->name() == "MementoCommand" ||
+		{
+			XMLNode *n = *child_it;
+			Command *c;
+
+			if (n->name() == "MementoCommand" ||
 					n->name() == "MementoUndoCommand" ||
 					n->name() == "MementoRedoCommand") {
 
-			    if ((c = memento_command_factory(n))) {
-				    ut->add_command(c);
-			    }
-			    
-		    } else if (n->name() == X_("GlobalRouteStateCommand")) {
-
-			    if ((c = global_state_command_factory (*n))) {
-				    ut->add_command (c);
-			    }
-			    
-		    } else if (n->name() == "DeltaCommand") {
-		    	 PBD::ID  id(n->property("midi-source")->value());
-	    		 boost::shared_ptr<MidiSource> midi_source = 
-	    			 boost::dynamic_pointer_cast<MidiSource, Source>(source_by_id(id));
-		    	 if(midi_source) {
-		    		 ut->add_command(new MidiModel::DeltaCommand(midi_source->model(), *n));		    		 
-		    	 } else {
-		    		 error << "FIXME: Failed to downcast MidiSource for DeltaCommand" << endmsg;
-		    	 }
-		    } else {
-			    error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg;
-		    }
-	    }
-
-	    _history.add (ut);
-    }
-
-    return 0;
+				if ((c = memento_command_factory(n))) {
+					ut->add_command(c);
+				}
+
+			} else if (n->name() == "DeltaCommand") {
+				PBD::ID  id(n->property("midi-source")->value());
+				boost::shared_ptr<MidiSource> midi_source =
+					boost::dynamic_pointer_cast<MidiSource, Source>(source_by_id(id));
+				if (midi_source) {
+					ut->add_command(new MidiModel::DeltaCommand(midi_source->model(), *n));
+				} else {
+					error << _("Failed to downcast MidiSource for DeltaCommand") << endmsg;
+				}
+
+			} else if (n->name() == "DiffCommand") {
+				PBD::ID  id(n->property("midi-source")->value());
+				boost::shared_ptr<MidiSource> midi_source =
+					boost::dynamic_pointer_cast<MidiSource, Source>(source_by_id(id));
+				if (midi_source) {
+					ut->add_command(new MidiModel::DiffCommand(midi_source->model(), *n));
+				} else {
+					error << _("Failed to downcast MidiSource for DeltaCommand") << endmsg;
+				}
+
+			} else {
+				error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg;
+			}
+		}
+
+		_history.add (ut);
+	}
+
+	return 0;
 }
 
 void
@@ -2941,20 +2936,20 @@ Session::config_changed (std::string p, bool ours)
 	if (ours) {
 		set_dirty ();
 	}
-	
+
 	if (p == "seamless-loop") {
-		
+
 	} else if (p == "rf-speed") {
-		
+
 	} else if (p == "auto-loop") {
-		
+
 	} else if (p == "auto-input") {
-		
+
 		if (Config->get_monitoring_model() == HardwareMonitoring && transport_rolling()) {
 			/* auto-input only makes a difference if we're rolling */
-			
+
 			boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-			
+
 			for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
 				if ((*i)->record_enabled ()) {
 					(*i)->monitor_input (!config.get_auto_input());
@@ -2965,34 +2960,34 @@ Session::config_changed (std::string p, bool ours)
 	} else if (p == "punch-in") {
 
 		Location* location;
-		
+
 		if ((location = _locations.auto_punch_location()) != 0) {
-			
+
 			if (config.get_punch_in ()) {
-				replace_event (Event::PunchIn, location->start());
+				replace_event (SessionEvent::PunchIn, location->start());
 			} else {
-				remove_event (location->start(), Event::PunchIn);
+				remove_event (location->start(), SessionEvent::PunchIn);
 			}
 		}
-		
+
 	} else if (p == "punch-out") {
 
 		Location* location;
-		
+
 		if ((location = _locations.auto_punch_location()) != 0) {
-			
+
 			if (config.get_punch_out()) {
-				replace_event (Event::PunchOut, location->end());
+				replace_event (SessionEvent::PunchOut, location->end());
 			} else {
-				clear_events (Event::PunchOut);
+				clear_events (SessionEvent::PunchOut);
 			}
 		}
 
 	} else if (p == "edit-mode") {
 
-		Glib::Mutex::Lock lm (playlist_lock);
-		
-		for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+		Glib::Mutex::Lock lm (playlists->lock);
+
+		for (SessionPlaylists::List::iterator i = playlists->playlists.begin(); i != playlists->playlists.end(); ++i) {
 			(*i)->set_edit_mode (Config->get_edit_mode ());
 		}
 
@@ -3017,14 +3012,14 @@ Session::config_changed (std::string p, bool ours)
 		}
 
 	} else if (p == "midi-control") {
-		
+
 		//poke_midi_thread ();
 
 	} else if (p == "raid-path") {
 
 		setup_raid_path (config.get_raid_path());
 
-	} else if (p == "smpte-format") {
+	} else if (p == "timecode-format") {
 
 		sync_time_vars ();
 
@@ -3063,11 +3058,11 @@ Session::config_changed (std::string p, bool ours)
 		}
 
 	} else if (p == "send-mtc") {
-		
+
 		/* only set the internal flag if we have
 		   a port.
 		*/
-		
+
 		if (_mtc_port != 0) {
 			session_send_mtc = Config->get_send_mtc();
 			if (session_send_mtc) {
@@ -3079,24 +3074,24 @@ Session::config_changed (std::string p, bool ours)
 		}
 
 	} else if (p == "send-mmc") {
-		
+
 		/* only set the internal flag if we have
 		   a port.
 		*/
-		
+
 		if (_mmc_port != 0) {
 			session_send_mmc = Config->get_send_mmc();
 		} else {
 			mmc = 0;
-			session_send_mmc = false; 
+			session_send_mmc = false;
 		}
 
 	} else if (p == "midi-feedback") {
-		
+
 		/* only set the internal flag if we have
 		   a port.
 		*/
-		
+
 		if (_mtc_port != 0) {
 			session_midi_feedback = Config->get_midi_feedback();
 		}
@@ -3121,8 +3116,12 @@ Session::config_changed (std::string p, bool ours)
 
 		first_file_data_format_reset = false;
 
-	} else if (p == "slave-source") {
-				set_slave_source (Config->get_slave_source());
+	} else if (p == "external-sync") {
+		if (!config.get_external_sync()) {
+			drop_sync_source ();
+		} else {
+			switch_to_sync_source (config.get_sync_source());
+		}
 	} else if (p == "remote-model") {
 		set_remote_control_ids ();
 	}  else if (p == "denormal-model") {
@@ -3135,7 +3134,7 @@ Session::config_changed (std::string p, bool ours)
 
 		if (_mmc_port && Config->get_initial_program_change() >= 0) {
 			MIDI::byte buf[2];
-			
+
 			buf[0] = MIDI::program; // channel zero by default
 			buf[1] = (Config->get_initial_program_change() & 0x7f);
 
@@ -3145,17 +3144,20 @@ Session::config_changed (std::string p, bool ours)
 
 		if (_mmc_port && Config->get_initial_program_change() >= 0) {
 			MIDI::byte* buf = new MIDI::byte[2];
-			
+
 			buf[0] = MIDI::program; // channel zero by default
 			buf[1] = (Config->get_initial_program_change() & 0x7f);
 			// deliver_midi (_mmc_port, buf, 2);
 		}
 	} else if (p == "solo-mute-override") {
 		// catch_up_on_solo_mute_override ();
-	} else if (p == "solo-model") {
-		solo_model_changed ();
+	} else if (p == "listen-position") {
+		listen_position_changed ();
+	} else if (p == "solo-control-is-listen-control") {
+		solo_control_mode_changed ();
 	}
 
+
 	set_dirty ();
 }