Make Session::audible_frame() return a (more) correct answer when the transport has...
[ardour.git] / libs / ardour / session_state.cc
index 79c937daebf3d740eae9be3ad1df8c3ce2413f48..ae2eda81d48b8be5630d90ad18ad6a687267ace9 100644 (file)
@@ -30,7 +30,6 @@
 #include <string>
 #include <cerrno>
 
-#include <sigc++/bind.h>
 
 #include <cstdio> /* snprintf(3) ... grrr */
 #include <cmath>
 #include "midi++/port.h"
 
 #include "pbd/boost_debug.h"
+#include "pbd/controllable_descriptor.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 "pbd/convert.h"
 
+#include "ardour/amp.h"
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
 #include "ardour/audioengine.h"
@@ -145,10 +147,8 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        }
 
        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;
        }
 
@@ -165,7 +165,7 @@ 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->PropertyChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));
 
 
        _non_soloed_outs_muted = false;
@@ -178,13 +178,13 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        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)));
+       _session_range_location = new Location (0, 0, _("session"), Location::IsSessionRange);
        g_atomic_int_set (&_record_status, Disabled);
        loop_changing = false;
        play_loop = false;
        have_looped = false;
        _last_roll_location = 0;
+       _last_roll_or_reversal_location = 0;
        _last_record_location = 0;
        pending_locate_frame = 0;
        pending_locate_roll = false;
@@ -210,16 +210,12 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        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;
        pending_abort = false;
        destructive_index = 0;
        first_file_data_format_reset = true;
        first_file_header_format_reset = true;
        post_export_sync = false;
-       //midi_thread = (pthread_t) 0;
+       midi_control_ui = 0;
 
        AudioDiskstream::allocate_working_buffers();
 
@@ -267,20 +263,15 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        delta_accumulator_cnt = 0;
        _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));
+       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));
+       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 */
 
@@ -289,11 +280,11 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 }
 
 int
-Session::second_stage_init (bool new_session)
+Session::second_stage_init ()
 {
        AudioFileSource::set_peak_dir (_session_dir->peak_path().to_string());
 
-       if (!new_session) {
+       if (!_is_new) {
                if (load_state (_current_snapshot_name)) {
                        return -1;
                }
@@ -332,18 +323,18 @@ 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();
+               when_engine_running ();
        }
 
        /* handle this one in a different way than all others, so that its clear what happened */
@@ -364,16 +355,16 @@ Session::second_stage_init (bool new_session)
        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);
+       config.set_end_marker_is_free (_is_new);
 
        _state_of_the_state = Clean;
 
@@ -499,7 +490,7 @@ Session::ensure_subdirs ()
 }
 
 int
-Session::create (bool& new_session, const string& mix_template, nframes_t initial_length)
+Session::create (const string& mix_template, nframes_t initial_length, BusProfile* bus_profile)
 {
 
        if (g_mkdir_with_parents (_path.c_str(), 0755) < 0) {
@@ -511,8 +502,6 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia
                return -1;
        }
 
-       /* check new_session so we don't overwrite an existing one */
-
        if (!mix_template.empty()) {
                std::string in_path = mix_template;
 
@@ -527,11 +516,7 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia
 
                        if (out){
                                out << in.rdbuf();
-
-                               // okay, session is set up.  Treat like normal saved
-                               // session from now on.
-
-                               new_session = false;
+                                _is_new = false;
                                return 0;
 
                        } else {
@@ -554,49 +539,70 @@ Session::create (bool& new_session, const string& mix_template, nframes_t initia
 
        /* set initial start + end point */
 
-       start_location->set_end (0);
-       _locations.add (start_location);
-
-       end_location->set_end (initial_length);
-       _locations.add (end_location);
+       _session_range_location->set (0, initial_length);
+       _locations.add (_session_range_location);
 
        _state_of_the_state = Clean;
+        
+        /* set up Master Out and Control Out if necessary */
+
+        if (bus_profile) {
+
+               RouteList rl;
+               int control_id = 1;
+                ChanCount count(DataType::AUDIO, bus_profile->master_out_channels);
+
+               if (bus_profile->master_out_channels) {
+                       Route* rt = new Route (*this, _("master"), Route::MasterOut, DataType::AUDIO);
+                        if (rt->init ()) {
+                                delete rt;
+                                return -1;
+                        }
+                       boost_debug_shared_ptr_mark_interesting (rt, "Route");
+                       boost::shared_ptr<Route> r (rt);
+                       r->input()->ensure_io (count, false, this);
+                       r->output()->ensure_io (count, false, this);
+                       r->set_remote_control_id (control_id++);
+
+                       rl.push_back (r);
+
+                        if (Config->get_use_monitor_bus()) {
+                                Route* rt = new Route (*this, _("monitor"), Route::MonitorOut, DataType::AUDIO);
+                                if (rt->init ()) {
+                                        delete rt;
+                                        return -1;
+                                }
+                                boost_debug_shared_ptr_mark_interesting (rt, "Route");
+                                boost::shared_ptr<Route> r (rt);
+                                r->input()->ensure_io (count, false, this);
+                                r->output()->ensure_io (count, false, this);
+                                r->set_remote_control_id (control_id);
+                                
+                                rl.push_back (r);
+                        }
 
-       save_state ("");
-
-       return 0;
-}
-
-
-int
-Session::load_diskstreams (const XMLNode& node)
-{
-       XMLNodeList          clist;
-       XMLNodeConstIterator citer;
+               } else {
+                       /* prohibit auto-connect to master, because there isn't one */
+                       bus_profile->output_ac = AutoConnectOption (bus_profile->output_ac & ~AutoConnectMaster);
+               }
 
-       clist = node.children();
+               if (!rl.empty()) {
+                       add_routes (rl, false);
+               }
 
-       for (citer = clist.begin(); citer != clist.end(); ++citer) {
+                /* this allows the user to override settings with an environment variable.
+                 */
 
-               try {
-                       /* diskstreams added automatically by DiskstreamCreated handler */
-                       if ((*citer)->name() == "AudioDiskstream" || (*citer)->name() == "DiskStream") {
-                               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));
-                               add_diskstream (dstream);
-                       } else {
-                               error << _("Session: unknown diskstream type in XML") << endmsg;
-                       }
-               }
+                if (no_auto_connect()) {
+                        bus_profile->input_ac = AutoConnectOption (0);
+                        bus_profile->output_ac = AutoConnectOption (0);
+                }
+                
+                Config->set_input_auto_connect (bus_profile->input_ac);
+                Config->set_output_auto_connect (bus_profile->output_ac);
+        }
 
-               catch (failed_constructor& err) {
-                       error << _("Session: could not load diskstream via XML state") << endmsg;
-                       return -1;
-               }
-       }
+       save_state ("");
 
        return 0;
 }
@@ -680,8 +686,37 @@ Session::remove_state (string snapshot_name)
        sys::remove (xml_path);
 }
 
+#ifdef HAVE_JACK_SESSION
+void
+Session::jack_session_event (jack_session_event_t * event)
+{
+       if (save_state ("jacksession_snap")) {
+                event->flags = JackSessionSaveError; 
+       } else {
+                sys::path xml_path (_session_dir->root_path());
+                xml_path /= legalize_for_path ("jacksession_snap") + statefile_suffix;
+                
+                string cmd ("PROG_NAME -U ");
+                cmd += event->client_uuid;
+                cmd += " \"";
+                cmd += xml_path.to_string();
+                cmd += '\"';
+                
+                event->command_line = strdup (cmd.c_str());
+       }
+
+       jack_session_reply (_engine.jack(), event);
+
+       if (event->type == JackSessionSaveAndQuit) {
+                // TODO: make ardour quit.
+       }
+
+       jack_session_event_free( event );
+}
+#endif
+
 int
-Session::save_state (string snapshot_name, bool pending)
+Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot)
 {
        XMLTree tree;
        sys::path xml_path(_session_dir->root_path());
@@ -691,7 +726,8 @@ Session::save_state (string snapshot_name, bool pending)
        }
 
        if (!_engine.connected ()) {
-               error << _("Ardour's audio engine is not connected and state saving would lose all I/O connections. Session not saved")
+               error << string_compose (_("the %1 audio engine is not connected and state saving would lose all I/O connections. Session not saved"),
+                                         PROGRAM_NAME)
                      << endmsg;
                return 1;
        }
@@ -705,7 +741,9 @@ Session::save_state (string snapshot_name, bool pending)
 
        if (snapshot_name.empty()) {
                snapshot_name = _current_snapshot_name;
-       }
+       } else if (switch_to_snapshot) {
+                _current_snapshot_name = snapshot_name;
+        }
 
        if (!pending) {
 
@@ -792,7 +830,7 @@ Session::load_state (string snapshot_name)
 
                /* there is pending state from a crashed capture attempt */
 
-               if (AskAboutPendingState()) {
+               if (*AskAboutPendingState()) {
                        state_was_pending = true;
                }
        }
@@ -830,7 +868,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;
+               error << string_compose (_("Session file %1 is not a session"), xmlpath.to_string()) << endmsg;
                delete state_tree;
                state_tree = 0;
                return -1;
@@ -861,8 +899,8 @@ Session::load_state (string snapshot_name)
                        return 0;
                }
 
-               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())
+               info << string_compose (_("Copying old session file %1 to %2\nUse %2 with %3 versions before 2.0 from now on"),
+                                       xmlpath.to_string(), backup_path.to_string(), PROGRAM_NAME)
                     << endmsg;
 
                try
@@ -995,26 +1033,14 @@ Session::state(bool 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) {
-                               child->add_child_nocopy (i->second->state (true));
-                       }
-               }
-       }
-
-       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()) {
-                               child->add_child_nocopy ((*i)->get_state());
-                       }
-               }
+                const RegionFactory::RegionMap& region_map (RegionFactory::all_regions());
+                for (RegionFactory::RegionMap::const_iterator i = region_map.begin(); i != region_map.end(); ++i) {
+                        boost::shared_ptr<Region> r = i->second;
+                        /* only store regions not attached to playlists */
+                        if (r->playlist() == 0) {
+                                child->add_child_nocopy (r->state (true));
+                        }
+                }
        }
 
        if (full_state) {
@@ -1023,12 +1049,9 @@ Session::state(bool full_state)
                // for a template, just create a new Locations, populate it
                // with the default start and end, and get the state for that.
                Locations loc;
-               Location* start = new Location(0, 0, _("start"), Location::Flags ((Location::IsMark|Location::IsStart)));
-               Location* end = new Location(0, 0, _("end"), Location::Flags ((Location::IsMark|Location::IsEnd)));
-               start->set_end(0);
-               loc.add (start);
-               end->set_end(compute_initial_length());
-               loc.add (end);
+               Location* range = new Location (0, 0, _("session"), Location::IsSessionRange);
+               range->set (0, compute_initial_length ());
+               loc.add (range);
                node->add_child_nocopy (loc.get_state());
        }
 
@@ -1051,6 +1074,12 @@ Session::state(bool full_state)
                RouteList public_order (*r);
                public_order.sort (cmp);
 
+                /* the sort should have put control outs first */
+
+                if (_monitor_out) {
+                        assert (_monitor_out == public_order.front());
+                }
+
                for (RouteList::iterator i = public_order.begin(); i != public_order.end(); ++i) {
                        if (!(*i)->is_hidden()) {
                                if (full_state) {
@@ -1062,7 +1091,7 @@ Session::state(bool full_state)
                }
        }
 
-       playlists.add_state (node, 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) {
@@ -1129,7 +1158,7 @@ Session::set_state (const XMLNode& node, int version)
                _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;
                        }
                }
@@ -1164,7 +1193,6 @@ Session::set_state (const XMLNode& node, int version)
        Locations
        Sources
        AudioRegions
-       AudioDiskstreams
        Connections
        Routes
        RouteGroups
@@ -1213,21 +1241,14 @@ Session::set_state (const XMLNode& node, int version)
                set_auto_punch_location (location);
        }
 
-       if ((location = _locations.end_location()) == 0) {
-               _locations.add (end_location);
-       } else {
-               delete end_location;
-               end_location = location;
-       }
-
-       if ((location = _locations.start_location()) == 0) {
-               _locations.add (start_location);
+       if ((location = _locations.session_range_location()) == 0) {
+               _locations.add (_session_range_location);
        } else {
-               delete start_location;
-               start_location = location;
+               delete _session_range_location;
+               _session_range_location = location;
        }
 
-       AudioFileSource::set_header_position_offset (start_location->start());
+       AudioFileSource::set_header_position_offset (_session_range_location->start());
 
        if ((child = find_named_node (node, "Sources")) == 0) {
                error << _("Session: XML state has no sources section") << endmsg;
@@ -1246,13 +1267,13 @@ Session::set_state (const XMLNode& node, int version)
        if ((child = find_named_node (node, "Playlists")) == 0) {
                error << _("Session: XML state has no playlists section") << endmsg;
                goto out;
-       } else if (playlists.load (*this, *child)) {
+       } else if (playlists->load (*this, *child)) {
                goto out;
        }
 
        if ((child = find_named_node (node, "UnusedPlaylists")) == 0) {
                // this is OK
-       } else if (playlists.load_unused (*this, *child)) {
+       } else if (playlists->load_unused (*this, *child)) {
                goto out;
        }
        
@@ -1262,13 +1283,6 @@ Session::set_state (const XMLNode& node, int version)
                }
        }
 
-       if ((child = find_named_node (node, "DiskStreams")) == 0) {
-               error << _("Session: XML state has no diskstreams section") << endmsg;
-               goto out;
-       } else if (load_diskstreams (*child)) {
-               goto out;
-       }
-
        if (version >= 3000) {
                if ((child = find_named_node (node, "Bundles")) == 0) {
                        warning << _("Session: XML state has no bundles section") << endmsg;
@@ -1281,6 +1295,32 @@ Session::set_state (const XMLNode& node, int version)
                }
        }
        
+       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, version)) {
+               goto out;
+       }
+
+       if (version < 3000) {
+               if ((child = find_named_node (node, X_("DiskStreams"))) == 0) {
+                       error << _("Session: XML state has no diskstreams section") << endmsg;
+                       goto out;
+               } else if (load_diskstreams_2X (*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, version)) {
+               goto out;
+       }
+
+       /* our diskstreams list is no longer needed as they are now all owned by their Route */
+       _diskstreams_2X.clear ();
+
        if (version >= 3000) {
                
                if ((child = find_named_node (node, "RouteGroups")) == 0) {
@@ -1307,20 +1347,6 @@ Session::set_state (const XMLNode& node, int version)
                }
        }
 
-       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, 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, version)) {
-               goto out;
-       }
-
        if ((child = find_named_node (node, "Click")) == 0) {
                warning << _("Session: XML state has no click section") << endmsg;
        } else if (_click_io) {
@@ -1354,8 +1380,13 @@ Session::load_routes (const XMLNode& node, int version)
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
-               boost::shared_ptr<Route> route (XMLRouteFactory (**niter, version));
-
+               boost::shared_ptr<Route> route;
+               if (version < 3000) {
+                       route = XMLRouteFactory_2X (**niter, version);
+               } else {
+                       route = XMLRouteFactory (**niter, version);
+               }
+               
                if (route == 0) {
                        error << _("Session: cannot create Route from XML description.") << endmsg;
                        return -1;
@@ -1374,35 +1405,132 @@ Session::load_routes (const XMLNode& node, int version)
 boost::shared_ptr<Route>
 Session::XMLRouteFactory (const XMLNode& node, int version)
 {
+       boost::shared_ptr<Route> ret;
+
        if (node.name() != "Route") {
-               return boost::shared_ptr<Route> ((Route*) 0);
+               return ret;
        }
 
-       bool has_diskstream = (node.property ("diskstream") != 0 || node.property ("diskstream-id") != 0);
+       XMLNode* ds_child = find_named_node (node, X_("Diskstream"));
 
        DataType type = DataType::AUDIO;
        const XMLProperty* prop = node.property("default-type");
 
        if (prop) {
-               type = DataType(prop->value());
+               type = DataType (prop->value());
+       }
+
+       assert (type != DataType::NIL);
+
+       if (ds_child) {
+
+                Track* track;
+                
+                if (type == DataType::AUDIO) {
+                        track = new AudioTrack (*this, X_("toBeResetFroXML"));
+                        
+                } else {
+                        track = new MidiTrack (*this, X_("toBeResetFroXML"));
+                }
+                
+                if (track->init()) {
+                        delete track;
+                        return ret;
+                }
+                
+                if (track->set_state (node, version)) {
+                        delete track;
+                        return ret;
+                }
+                
+                boost_debug_shared_ptr_mark_interesting (track, "Track");
+                ret.reset (track);
+                
+       } else {
+               Route* rt = new Route (*this, X_("toBeResetFroXML"));
+
+                if (rt->init () == 0 && rt->set_state (node, version) == 0) {
+                        boost_debug_shared_ptr_mark_interesting (rt, "Route");
+                        ret.reset (rt);
+                } else {
+                        delete rt;
+                }
        }
 
-       assert(type != DataType::NIL);
+       return ret;
+}
+
+boost::shared_ptr<Route>
+Session::XMLRouteFactory_2X (const XMLNode& node, int version)
+{
+       boost::shared_ptr<Route> ret;
 
-       if (has_diskstream) {
-               if (type == DataType::AUDIO) {
-                       AudioTrack* at = new AudioTrack (*this, node, version);
-                       // boost_debug_shared_ptr_mark_interesting (at, typeid (at).name());
-                       boost::shared_ptr<Route> ret (at);
-                       return ret;
-               } else {
-                       boost::shared_ptr<Route> ret (new MidiTrack (*this, node, version));
-                       return ret;
-               }
-       } else {
-               boost::shared_ptr<Route> ret (new Route (*this, node));
+       if (node.name() != "Route") {
                return ret;
        }
+
+       XMLProperty const * ds_prop = node.property (X_("diskstream-id"));
+       if (!ds_prop) {
+               ds_prop = node.property (X_("diskstream"));
+       }
+
+       DataType type = DataType::AUDIO;
+       const XMLProperty* prop = node.property("default-type");
+
+       if (prop) {
+               type = DataType (prop->value());
+       }
+
+       assert (type != DataType::NIL);
+
+       if (ds_prop) {
+
+               list<boost::shared_ptr<Diskstream> >::iterator i = _diskstreams_2X.begin ();
+               while (i != _diskstreams_2X.end() && (*i)->id() != ds_prop->value()) {
+                       ++i;
+               }
+
+               if (i == _diskstreams_2X.end()) {
+                       error << _("Could not find diskstream for route") << endmsg;
+                       return boost::shared_ptr<Route> ();
+               }
+
+                Track* track;
+                
+                if (type == DataType::AUDIO) {
+                        track = new AudioTrack (*this, X_("toBeResetFroXML"));
+                        
+                } else {
+                        track = new MidiTrack (*this, X_("toBeResetFroXML"));
+                }
+                
+                if (track->init()) {
+                        delete track;
+                        return ret;
+                }
+                
+                if (track->set_state (node, version)) {
+                        delete track;
+                        return ret;
+                }
+
+               track->set_diskstream (*i);
+                
+                boost_debug_shared_ptr_mark_interesting (track, "Track");
+                ret.reset (track);
+                
+       } else {
+               Route* rt = new Route (*this, X_("toBeResetFroXML"));
+
+                if (rt->init () == 0 && rt->set_state (node, version) == 0) {
+                        boost_debug_shared_ptr_mark_interesting (rt, "Route");
+                        ret.reset (rt);
+                } else {
+                        delete rt;
+                }
+       }
+
+       return ret;
 }
 
 int
@@ -1730,7 +1858,7 @@ Session::XMLSourceFactory (const XMLNode& node)
        }
 
        catch (failed_constructor& err) {
-               error << _("Found a sound file that cannot be used by Ardour. Talk to the progammers.") << endmsg;
+               error << string_compose (_("Found a sound file that cannot be used by %1. Talk to the progammers."), PROGRAM_NAME) << endmsg;
                return boost::shared_ptr<Source>();
        }
 }
@@ -2103,15 +2231,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)
 {
@@ -2125,6 +2252,23 @@ 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)
 {
@@ -2160,92 +2304,6 @@ 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*/)
 {
@@ -2360,6 +2418,12 @@ struct RegionCounter {
     RegionCounter() : count (0) {}
 };
 
+int
+Session::ask_about_playlist_deletion (boost::shared_ptr<Playlist> p)
+{
+       return *AskAboutPlaylistDeletion (p);
+}
+
 int
 Session::cleanup_sources (CleanupReport& rep)
 {
@@ -2381,7 +2445,7 @@ Session::cleanup_sources (CleanupReport& rep)
 
        /* step 1: consider deleting all unused playlists */
        
-       if (playlists.maybe_delete_unused (AskAboutPlaylistDeletion)) {
+       if (playlists->maybe_delete_unused (boost::bind (Session::ask_about_playlist_deletion, _1))) {
                ret = 0;
                goto out;
        }
@@ -2402,9 +2466,9 @@ Session::cleanup_sources (CleanupReport& rep)
                   capture files.
                */
 
-               if (!playlists.source_use_count(i->second) && 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;
@@ -2723,8 +2787,7 @@ 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);
@@ -2745,6 +2808,121 @@ Session::controllable_by_id (const PBD::ID& id)
        return boost::shared_ptr<Controllable>();
 }
 
+boost::shared_ptr<Controllable>
+Session::controllable_by_descriptor (const ControllableDescriptor& desc)
+{
+       boost::shared_ptr<Controllable> c;
+       boost::shared_ptr<Route> r;
+
+       switch (desc.top_level_type()) {
+       case ControllableDescriptor::NamedRoute:
+       {
+               std::string str = desc.top_level_name();
+               if (str == "master") {
+                       r = _master_out;
+               } else if (str == "control" || str == "listen") {
+                       r = _monitor_out;
+               } else {
+                       r = route_by_name (desc.top_level_name());
+               }
+               break;
+       }
+
+       case ControllableDescriptor::RemoteControlID:
+               r = route_by_remote_id (desc.rid());
+               break;
+       }
+       
+       if (!r) {
+               return c;
+       }
+
+       switch (desc.subtype()) {
+       case ControllableDescriptor::Gain:
+               c = r->gain_control ();
+               break;
+
+       case ControllableDescriptor::Solo:
+               c = r->solo_control();
+               break;
+
+       case ControllableDescriptor::Mute:
+               c = r->mute_control();
+               break;
+
+       case ControllableDescriptor::Recenable:
+       {
+               boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(r);
+               
+               if (t) {
+                       c = t->rec_enable_control ();
+               }
+               break;
+       }
+
+       case ControllableDescriptor::Pan:
+               /* XXX pan control */
+               break;
+
+       case ControllableDescriptor::Balance:
+               /* XXX simple pan control */
+               break;
+
+       case ControllableDescriptor::PluginParameter:
+       {
+               uint32_t plugin = desc.target (0);
+               uint32_t parameter_index = desc.target (1);
+
+               /* 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->control(Evoral::Parameter(PluginAutomation, 0, parameter_index)));
+               }
+               break;
+       }
+
+       case ControllableDescriptor::SendGain: 
+       {
+               uint32_t send = desc.target (0);
+
+               /* 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);
+                       boost::shared_ptr<Amp> a = s->amp();
+
+                       if (a) {
+                               c = s->amp()->gain_control();
+                       }
+               }
+               break;
+       }
+
+       default:
+               /* relax and return a null pointer */
+               break;
+       }
+
+       return c;
+}
+
 void
 Session::add_instant_xml (XMLNode& node, bool write_to_config)
 {
@@ -2876,12 +3054,6 @@ Session::restore_history (string snapshot_name)
                                        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 =
@@ -2902,6 +3074,10 @@ Session::restore_history (string snapshot_name)
                                        error << _("Failed to downcast MidiSource for DeltaCommand") << endmsg;
                                }
 
+                       } else if (n->name() == "StatefulDiffCommand") {
+                               if ((c = stateful_diff_command_factory (n))) {
+                                       ut->add_command (c);
+                               }
                        } else {
                                error << string_compose(_("Couldn't figure out how to make a Command out of a %1 XMLNode."), n->name()) << endmsg;
                        }
@@ -2931,11 +3107,11 @@ Session::config_changed (std::string p, bool ours)
                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());
+                       boost::shared_ptr<RouteList> rl = routes.reader ();
+                       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+                               boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
+                               if (tr && tr->record_enabled ()) {
+                                       tr->monitor_input (!config.get_auto_input());
                                }
                        }
                }
@@ -2968,9 +3144,9 @@ Session::config_changed (std::string p, bool ours)
 
        } else if (p == "edit-mode") {
 
-               Glib::Mutex::Lock lm (playlists.lock);
+               Glib::Mutex::Lock lm (playlists->lock);
 
-               for (SessionPlaylists::List::iterator i = playlists.playlists.begin(); i != playlists.playlists.end(); ++i) {
+               for (SessionPlaylists::List::iterator i = playlists->playlists.begin(); i != playlists->playlists.end(); ++i) {
                        (*i)->set_edit_mode (Config->get_edit_mode ());
                }
 
@@ -3149,3 +3325,32 @@ Session::set_history_depth (uint32_t d)
 {
        _history.set_depth (d);
 }
+
+int
+Session::load_diskstreams_2X (XMLNode const & node, int)
+{
+        XMLNodeList          clist;
+        XMLNodeConstIterator citer;
+
+        clist = node.children();
+
+        for (citer = clist.begin(); citer != clist.end(); ++citer) {
+
+                try {
+                        /* diskstreams added automatically by DiskstreamCreated handler */
+                        if ((*citer)->name() == "AudioDiskstream" || (*citer)->name() == "DiskStream") {
+                               boost::shared_ptr<AudioDiskstream> dsp (new AudioDiskstream (*this, **citer));
+                               _diskstreams_2X.push_back (dsp);
+                        } 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;
+                }
+        }
+
+        return 0;
+}