provide access to Send + Plugins from MIDI binding maps
[ardour.git] / libs / ardour / session_state.cc
index 4a5d974563dc0feed12b63972921db0c0d74e25c..3c8fe86c13fc6359a307fb121f2bc2331ecb9034 100644 (file)
@@ -30,7 +30,6 @@
 #include <string>
 #include <cerrno>
 
-#include <sigc++/bind.h>
 
 #include <cstdio> /* snprintf(3) ... grrr */
 #include <cmath>
 #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"
@@ -87,7 +89,6 @@
 #include "ardour/midi_source.h"
 #include "ardour/midi_track.h"
 #include "ardour/named_selection.h"
-#include "ardour/playlist_factory.h"
 #include "ardour/processor.h"
 #include "ardour/region_factory.h"
 #include "ardour/route_group.h"
@@ -96,6 +97,7 @@
 #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/utils.h"
 #include "ardour/utils.h"
 #include "ardour/version.h"
+#include "ardour/playlist_factory.h"
 
 #include "control_protocol/control_protocol.h"
 
@@ -162,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->StateChanged.connect_same_thread (*this, boost::bind (&Session::tempo_map_changed, this, _1));
 
 
        _non_soloed_outs_muted = false;
@@ -174,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);
@@ -187,27 +191,25 @@ Session::first_stage_init (string fullpath, string snapshot_name)
        pending_locate_flush = false;
        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 (&_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;
@@ -215,7 +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;
-       //midi_thread = (pthread_t) 0;
+       post_export_sync = false;
+       midi_control_ui = 0;
 
        AudioDiskstream::allocate_working_buffers();
 
@@ -244,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 ();
 
@@ -261,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 */
 
@@ -328,15 +328,15 @@ 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();
@@ -360,14 +360,14 @@ 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);
 
@@ -433,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 ()
 {
@@ -566,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));
@@ -776,7 +788,7 @@ Session::load_state (string snapshot_name)
 
                /* there is pending state from a crashed capture attempt */
 
-               if (AskAboutPendingState()) {
+               if (*AskAboutPendingState()) {
                        state_was_pending = true;
                }
        }
@@ -869,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;
 }
 
@@ -1054,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));
@@ -1147,7 +1125,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;
                        }
                }
@@ -1264,13 +1242,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 (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;
        }
        
@@ -1299,6 +1277,20 @@ 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 (version >= 3000) {
                
                if ((child = find_named_node (node, "RouteGroups")) == 0) {
@@ -1325,20 +1317,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) {
@@ -1400,6 +1378,7 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
 
        DataType type = DataType::AUDIO;
        const XMLProperty* prop = node.property("default-type");
+       boost::shared_ptr<Route> ret;
 
        if (prop) {
                type = DataType(prop->value());
@@ -1409,16 +1388,20 @@ Session::XMLRouteFactory (const XMLNode& node, int version)
 
        if (has_diskstream) {
                if (type == DataType::AUDIO) {
-                       boost::shared_ptr<Route> ret (new AudioTrack (*this, node, version));
-                       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, version));
-                       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
@@ -1950,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)
 {
@@ -2178,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)
 {
@@ -2200,6 +2123,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)
 {
@@ -2235,92 +2175,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*/)
 {
@@ -2436,12 +2290,17 @@ struct RegionCounter {
 };
 
 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;
@@ -2455,38 +2314,13 @@ Session::cleanup_sources (Session::cleanup_report& rep)
 
        _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 ();
@@ -2503,9 +2337,9 @@ 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;
@@ -2699,7 +2533,7 @@ 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
 
@@ -2824,8 +2658,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);
@@ -2846,6 +2679,95 @@ Session::controllable_by_id (const PBD::ID& id)
        return boost::shared_ptr<Controllable>();
 }
 
+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)
 {
@@ -2977,12 +2899,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 =
@@ -3048,9 +2964,9 @@ Session::config_changed (std::string p, bool ours)
                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);
                        }
                }
 
@@ -3061,17 +2977,17 @@ Session::config_changed (std::string p, bool ours)
                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);
+               Glib::Mutex::Lock lm (playlists->lock);
 
-               for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); ++i) {
+               for (SessionPlaylists::List::iterator i = playlists->playlists.begin(); i != playlists->playlists.end(); ++i) {
                        (*i)->set_edit_mode (Config->get_edit_mode ());
                }
 
@@ -3103,7 +3019,7 @@ Session::config_changed (std::string p, bool ours)
 
                setup_raid_path (config.get_raid_path());
 
-       } else if (p == "smpte-format") {
+       } else if (p == "timecode-format") {
 
                sync_time_vars ();
 
@@ -3200,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") {