add -Wpointer-arith -Wcast-qual -Wcast-align and others to compile flags, and fix...
[ardour.git] / libs / ardour / route.cc
index 28cefd5ae58cf3395f9c73a0cbdfcf8b87010b72..94530e3890e911e4f70ebd28d73f818abfe5ec72 100644 (file)
@@ -66,8 +66,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
-uint32_t Route::order_key_cnt = 0;
-PBD::Signal1<void,string const&> Route::SyncOrderKeys;
+PBD::Signal1<void,RouteSortOrderKey> Route::SyncOrderKeys;
 PBD::Signal0<void> Route::RemoteControlIDChange;
 
 Route::Route (Session& sess, string name, Flag flg, DataType default_type)
@@ -99,14 +98,6 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type)
        , _last_custom_meter_was_at_end (false)
 {
        processor_max_streams.reset();
-       order_keys[N_("signal")] = order_key_cnt++;
-
-       if (is_master()) {
-               set_remote_control_id (MasterBusRemoteControlID);
-       } else if (is_monitor()) {
-               set_remote_control_id (MonitorBusRemoteControlID);
-       }
-               
 }
 
 int
@@ -177,7 +168,7 @@ Route::init ()
 
        {
                /* run a configure so that the invisible processors get set up */
-               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                configure_processors (0);
        }
 
@@ -197,7 +188,7 @@ Route::~Route ()
           be half-destroyed by now
        */
 
-       Glib::RWLock::WriterLock lm (_processor_lock);
+       Glib::Threads::RWLock::WriterLock lm (_processor_lock);
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                (*i)->drop_references ();
        }
@@ -208,6 +199,15 @@ Route::~Route ()
 void
 Route::set_remote_control_id (uint32_t id, bool notify_class_listeners)
 {
+       if (Config->get_remote_model() != UserOrdered) {
+               return;
+       }
+       
+       if (id < 1) {
+               error << _("Remote Control ID's start at one, not zero") << endmsg;
+               return;
+       }
+
        /* force IDs for master/monitor busses and prevent 
           any other route from accidentally getting these IDs
           (i.e. legacy sessions)
@@ -228,9 +228,10 @@ Route::set_remote_control_id (uint32_t id, bool notify_class_listeners)
                id += MonitorBusRemoteControlID;
        }
 
-       if (id != _remote_control_id) {
+       if (id != remote_control_id()) {
                _remote_control_id = id;
                RemoteControlIDChanged ();
+
                if (notify_class_listeners) {
                        RemoteControlIDChange ();
                }
@@ -240,88 +241,101 @@ Route::set_remote_control_id (uint32_t id, bool notify_class_listeners)
 uint32_t
 Route::remote_control_id() const
 {
+       if (is_master()) {
+               return MasterBusRemoteControlID;
+       } 
+
+       if (is_monitor()) {
+               return MonitorBusRemoteControlID;
+       }
+
        return _remote_control_id;
 }
 
-int32_t
-Route::order_key (std::string const & name) const
+bool
+Route::has_order_key (RouteSortOrderKey key) const
+{
+       return (order_keys.find (key) != order_keys.end());
+}
+
+uint32_t
+Route::order_key (RouteSortOrderKey key) const
 {
-       OrderKeys::const_iterator i = order_keys.find (name);
+       OrderKeys::const_iterator i = order_keys.find (key);
+
        if (i == order_keys.end()) {
-               return -1;
+               return 0;
        }
 
        return i->second;
 }
 
 void
-Route::set_order_key (std::string const & name, int32_t n)
+Route::sync_order_keys (RouteSortOrderKey base)
 {
-       bool changed = false;
+       /* this is called after changes to 1 or more route order keys have been
+        * made, and we want to sync up.
+        */
 
-       /* This method looks more complicated than it should, but
-          it's important that we don't emit order_key_changed unless
-          it actually has, as expensive things happen on receipt of that
-          signal.
-       */
+       OrderKeys::iterator i = order_keys.find (base);
 
-       if (order_keys.find(name) == order_keys.end() || order_keys[name] != n) {
-               order_keys[name] = n;
-               changed = true;
+       if (i == order_keys.end()) {
+               return;
        }
 
-       if (Config->get_sync_all_route_ordering()) {
-               for (OrderKeys::iterator x = order_keys.begin(); x != order_keys.end(); ++x) {
-                       if (x->second != n) {
-                               x->second = n;
-                               changed = true;
-                       }
-               }
-       }
+       for (OrderKeys::iterator k = order_keys.begin(); k != order_keys.end(); ++k) {
 
-       if (changed) {
-               order_key_changed (); /* EMIT SIGNAL */
-               _session.set_dirty ();
+               if (k->first != base) {
+                       DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("%1 set key for %2 to %3 from %4\n",
+                                                                      name(),
+                                                                      enum_2_string (k->first),
+                                                                      i->second,
+                                                                      enum_2_string (base)));
+                                                                      
+                       k->second = i->second;
+               }
        }
 }
 
-/** Set all order keys to be the same as that for `base', if such a key
- *  exists in this route.
- *  @param base Base key.
- */
 void
-Route::sync_order_keys (std::string const & base)
+Route::set_remote_control_id_from_order_key (RouteSortOrderKey key, uint32_t rid)
 {
-       if (order_keys.empty()) {
+       if (is_master() || is_monitor() || is_hidden()) {
+               /* hard-coded remote IDs, or no remote ID */
                return;
        }
 
-       OrderKeys::iterator i;
-       int32_t key;
-
-       if ((i = order_keys.find (base)) == order_keys.end()) {
-               /* key doesn't exist, use the first existing key (during session initialization) */
-               i = order_keys.begin();
-               key = i->second;
-               ++i;
-       } else {
-               /* key exists - use it and reset all others (actually, itself included) */
-               key = i->second;
-               i = order_keys.begin();
+       if (_remote_control_id != rid) {
+               DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("%1: set edit-based RID to %2\n", name(), rid));
+               _remote_control_id = rid;
+               RemoteControlIDChanged (); /* EMIT SIGNAL (per-route) */
        }
 
-       bool changed = false;
+       /* don't emit the class-level RID signal RemoteControlIDChange here,
+          leave that to the entity that changed the order key, so that we
+          don't get lots of emissions for no good reasons (e.g. when changing
+          all route order keys).
 
-       for (; i != order_keys.end(); ++i) {
-               if (i->second != key) {
-                       i->second = key;
-                       changed = true;
-               }
-       }
+          See Session::sync_remote_id_from_order_keys() for the (primary|only)
+          spot where that is emitted.
+       */
+}
 
-       if (changed) {
-               order_key_changed (); /* EMIT SIGNAL */
+void
+Route::set_order_key (RouteSortOrderKey key, uint32_t n)
+{
+       OrderKeys::iterator i = order_keys.find (key);
+
+       if (i != order_keys.end() && i->second == n) {
+               return;
        }
+
+       order_keys[key] = n;
+
+       DEBUG_TRACE (DEBUG::OrderKeys, string_compose ("%1 order key %2 set to %3\n",
+                                                      name(), enum_2_string (key), order_key (key)));
+
+       _session.set_dirty ();
 }
 
 string
@@ -871,7 +885,7 @@ dump_processors(const string& name, const list<boost::shared_ptr<Processor> >& p
 boost::shared_ptr<Processor>
 Route::before_processor_for_placement (Placement p)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        ProcessorList::iterator loc;
        
@@ -896,7 +910,7 @@ Route::before_processor_for_index (int index)
                return boost::shared_ptr<Processor> ();
        }
 
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
        
        ProcessorList::iterator i = _processors.begin ();
        int j = 0;
@@ -949,7 +963,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, boost::shared_ptr<
        }
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                ProcessorState pstate (this);
 
                boost::shared_ptr<PluginInsert> pi;
@@ -989,7 +1003,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, boost::shared_ptr<
                // configure redirect ports properly, etc.
 
                {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                        if (configure_processors_unlocked (err)) {
                                pstate.restore ();
@@ -1118,7 +1132,7 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
        }
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                ProcessorState pstate (this);
 
                for (ProcessorList::const_iterator i = others.begin(); i != others.end(); ++i) {
@@ -1140,7 +1154,7 @@ Route::add_processors (const ProcessorList& others, boost::shared_ptr<Processor>
                        }
 
                        {
-                               Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                               Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                                if (configure_processors_unlocked (err)) {
                                        pstate.restore ();
                                        configure_processors_unlocked (0); // it worked before we tried to add it ...
@@ -1191,7 +1205,7 @@ Route::placement_range(Placement p, ProcessorList::iterator& start, ProcessorLis
 void
 Route::disable_processors (Placement p)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        ProcessorList::iterator start, end;
        placement_range(p, start, end);
@@ -1208,7 +1222,7 @@ Route::disable_processors (Placement p)
 void
 Route::disable_processors ()
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                (*i)->deactivate ();
@@ -1223,7 +1237,7 @@ Route::disable_processors ()
 void
 Route::disable_plugins (Placement p)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        ProcessorList::iterator start, end;
        placement_range(p, start, end);
@@ -1242,7 +1256,7 @@ Route::disable_plugins (Placement p)
 void
 Route::disable_plugins ()
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if (boost::dynamic_pointer_cast<PluginInsert> (*i)) {
@@ -1257,7 +1271,7 @@ Route::disable_plugins ()
 void
 Route::ab_plugins (bool forward)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        if (forward) {
 
@@ -1316,7 +1330,7 @@ Route::clear_processors (Placement p)
        }
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                ProcessorList new_list;
                ProcessorStreams err;
                bool seen_amp = false;
@@ -1362,7 +1376,7 @@ Route::clear_processors (Placement p)
                _processors = new_list;
 
                {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                        configure_processors_unlocked (&err); // this can't fail
                }
        }
@@ -1382,6 +1396,11 @@ Route::clear_processors (Placement p)
 int
 Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStreams* err, bool need_process_lock)
 {
+       // TODO once the export point can be configured properly, do something smarter here
+       if (processor == _capturing_processor) {
+               _capturing_processor.reset();
+       }
+
        /* these can never be removed */
 
        if (processor == _amp || processor == _meter || processor == _main_outs) {
@@ -1395,7 +1414,7 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
        processor_max_streams.reset();
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                ProcessorState pstate (this);
 
                ProcessorList::iterator i;
@@ -1416,12 +1435,7 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
                                boost::shared_ptr<IOProcessor> iop;
 
                                if ((iop = boost::dynamic_pointer_cast<IOProcessor> (*i)) != 0) {
-                                       if (iop->input()) {
-                                               iop->input()->disconnect (this);
-                                       }
-                                       if (iop->output()) {
-                                               iop->output()->disconnect (this);
-                                       }
+                                       iop->disconnect ();
                                }
 
                                i = _processors.erase (i);
@@ -1441,7 +1455,7 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
                } 
 
                if (need_process_lock) {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                        if (configure_processors_unlocked (err)) {
                                pstate.restore ();
@@ -1492,7 +1506,7 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams*
        processor_max_streams.reset();
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                ProcessorState pstate (this);
 
                ProcessorList::iterator i;
@@ -1539,7 +1553,7 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams*
                _output->set_user_latency (0);
 
                {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                        if (configure_processors_unlocked (err)) {
                                pstate.restore ();
@@ -1590,7 +1604,7 @@ Route::configure_processors (ProcessorStreams* err)
        assert (!AudioEngine::instance()->process_lock().trylock());
 
        if (!_in_configure_processors) {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                return configure_processors_unlocked (err);
        }
 
@@ -1606,7 +1620,7 @@ Route::input_streams () const
 list<pair<ChanCount, ChanCount> >
 Route::try_configure_processors (ChanCount in, ProcessorStreams* err)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        return try_configure_processors_unlocked (in, err);
 }
@@ -1711,7 +1725,7 @@ Route::configure_processors_unlocked (ProcessorStreams* err)
 void
 Route::all_visible_processors_active (bool state)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        if (_processors.empty()) {
                return;
@@ -1742,7 +1756,7 @@ Route::reorder_processors (const ProcessorList& new_order, ProcessorStreams* err
        */
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                ProcessorState pstate (this);
 
                ProcessorList::iterator oiter;
@@ -1804,7 +1818,7 @@ Route::reorder_processors (const ProcessorList& new_order, ProcessorStreams* err
                maybe_note_meter_position ();
 
                {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                        if (configure_processors_unlocked (err)) {
                                pstate.restore ();
@@ -1862,9 +1876,9 @@ Route::state(bool full_state)
        OrderKeys::iterator x = order_keys.begin();
 
        while (x != order_keys.end()) {
-               order_string += string ((*x).first);
+               order_string += enum_2_string ((*x).first);
                order_string += '=';
-               snprintf (buf, sizeof(buf), "%ld", (*x).second);
+               snprintf (buf, sizeof(buf), "%" PRId32, (*x).second);
                order_string += buf;
 
                ++x;
@@ -2084,7 +2098,18 @@ Route::set_state (const XMLNode& node, int version)
                                        error << string_compose (_("badly formed order key string in state file! [%1] ... ignored."), remaining)
                                              << endmsg;
                                } else {
-                                       set_order_key (remaining.substr (0, equal), n);
+                                       string keyname = remaining.substr (0, equal);
+                                       RouteSortOrderKey sk;
+
+                                       if (keyname == "signal") {
+                                               sk = MixerSort;
+                                       } else if (keyname == "editor") {
+                                               sk = EditorSort;
+                                       } else {
+                                               sk = (RouteSortOrderKey) string_2_enum (remaining.substr (0, equal), sk);
+                                       }
+
+                                       set_order_key (sk, n);
                                }
                        }
 
@@ -2100,7 +2125,7 @@ Route::set_state (const XMLNode& node, int version)
 
        if ((prop = node.property (X_("processor-after-last-custom-meter"))) != 0) {
                PBD::ID id (prop->value ());
-               Glib::RWLock::ReaderLock lm (_processor_lock);
+               Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
                ProcessorList::const_iterator i = _processors.begin ();
                while (i != _processors.end() && (*i)->id() != id) {
                        ++i;
@@ -2280,7 +2305,18 @@ Route::set_state_2X (const XMLNode& node, int version)
                                        error << string_compose (_("badly formed order key string in state file! [%1] ... ignored."), remaining)
                                                << endmsg;
                                } else {
-                                       set_order_key (remaining.substr (0, equal), n);
+                                       string keyname = remaining.substr (0, equal);
+                                       RouteSortOrderKey sk;
+
+                                       if (keyname == "signal") {
+                                               sk = MixerSort;
+                                       } else if (keyname == "editor") {
+                                               sk = EditorSort;
+                                       } else {
+                                               sk = (RouteSortOrderKey) string_2_enum (remaining.substr (0, equal), sk);
+                                       }
+
+                                       set_order_key (sk, n);
                                }
                        }
 
@@ -2454,7 +2490,8 @@ Route::set_processor_state (const XMLNode& node)
                        }
                        _monitor_control->set_state (**niter, Stateful::current_state_version);
                } else if (prop->value() == "capture") {
-                       _capturing_processor.reset (new CapturingProcessor (_session));
+                       /* CapturingProcessor should never be restored, it's always
+                          added explicitly when needed */
                } else {
                        ProcessorList::iterator o;
 
@@ -2522,11 +2559,11 @@ Route::set_processor_state (const XMLNode& node)
        }
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                _processors = new_order;
 
                if (must_configure) {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                        configure_processors_unlocked (0);
                }
 
@@ -2560,7 +2597,7 @@ Route::curve_reallocate ()
 void
 Route::silence (framecnt_t nframes)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        if (!lm.locked()) {
                return;
        }
@@ -2606,7 +2643,7 @@ Route::add_internal_return ()
 void
 Route::add_send_to_internal_return (InternalSend* send)
 {
-       Glib::RWLock::ReaderLock rm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock rm (_processor_lock);
 
        for (ProcessorList::const_iterator x = _processors.begin(); x != _processors.end(); ++x) {
                boost::shared_ptr<InternalReturn> d = boost::dynamic_pointer_cast<InternalReturn>(*x);
@@ -2620,7 +2657,7 @@ Route::add_send_to_internal_return (InternalSend* send)
 void
 Route::remove_send_from_internal_return (InternalSend* send)
 {
-       Glib::RWLock::ReaderLock rm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock rm (_processor_lock);
 
        for (ProcessorList::const_iterator x = _processors.begin(); x != _processors.end(); ++x) {
                boost::shared_ptr<InternalReturn> d = boost::dynamic_pointer_cast<InternalReturn>(*x);
@@ -2660,7 +2697,7 @@ Route::add_aux_send (boost::shared_ptr<Route> route, boost::shared_ptr<Processor
        assert (route != _session.monitor_out ());
 
        {
-               Glib::RWLock::ReaderLock rm (_processor_lock);
+               Glib::Threads::RWLock::ReaderLock rm (_processor_lock);
 
                for (ProcessorList::iterator x = _processors.begin(); x != _processors.end(); ++x) {
 
@@ -2678,7 +2715,7 @@ Route::add_aux_send (boost::shared_ptr<Route> route, boost::shared_ptr<Processor
                boost::shared_ptr<InternalSend> listener;
 
                {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                        listener.reset (new InternalSend (_session, _pannable, _mute_master, route, Delivery::Aux));
                }
 
@@ -2698,7 +2735,7 @@ Route::remove_aux_or_listen (boost::shared_ptr<Route> route)
        ProcessorList::iterator tmp;
 
        {
-               Glib::RWLock::ReaderLock rl(_processor_lock);
+               Glib::Threads::RWLock::ReaderLock rl(_processor_lock);
 
                /* have to do this early because otherwise processor reconfig
                 * will put _monitor_send back in the list
@@ -2834,11 +2871,7 @@ Route::nonrealtime_handle_transport_stopped (bool /*abort_ignored*/, bool did_lo
        framepos_t now = _session.transport_frame();
 
        {
-               Glib::RWLock::ReaderLock lm (_processor_lock);
-
-               if (!did_locate) {
-                       automation_snapshot (now, true);
-               }
+               Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
                Automatable::transport_stopped (now);
 
@@ -2925,7 +2958,7 @@ Route::pans_required () const
 int
 Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool session_state_changing)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        if (!lm.locked()) {
                return 0;
        }
@@ -2962,13 +2995,11 @@ Route::no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame,
 int
 Route::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, int declick, bool& /* need_butler */)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock, Glib::TRY_LOCK);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        if (!lm.locked()) {
                return 0;
        }
 
-       automation_snapshot (_session.transport_frame(), false);
-
        if (n_outputs().n_total() == 0) {
                return 0;
        }
@@ -3005,7 +3036,7 @@ Route::flush_processors ()
           this is called from the RT audio thread.
        */
 
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                (*i)->flush ();
@@ -3024,7 +3055,7 @@ Route::set_meter_point (MeterPoint p, bool force)
        bool meter_was_visible_to_user = _meter->display_to_user ();
 
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
 
                maybe_note_meter_position ();
 
@@ -3091,11 +3122,11 @@ void
 Route::listen_position_changed ()
 {
        {
-               Glib::RWLock::WriterLock lm (_processor_lock);
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
                ProcessorState pstate (this);
 
                {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
 
                        if (configure_processors_unlocked (0)) {
                                pstate.restore ();
@@ -3118,7 +3149,7 @@ Route::add_export_point()
                _capturing_processor->activate ();
 
                {
-                       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+                       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
                        configure_processors (0);
                }
 
@@ -3180,18 +3211,6 @@ Route::set_latency_compensation (framecnt_t longest_session_latency)
        }
 }
 
-void
-Route::automation_snapshot (framepos_t now, bool force)
-{
-       if (_pannable) {
-               _pannable->automation_snapshot (now, force);
-       }
-
-       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-               (*i)->automation_snapshot (now, force);
-       }
-}
-
 Route::SoloControllable::SoloControllable (std::string name, boost::shared_ptr<Route> r)
        : AutomationControl (r->session(), Evoral::Parameter (SoloAutomation),
                             boost::shared_ptr<AutomationList>(), name)
@@ -3290,19 +3309,20 @@ Route::protect_automation ()
                (*i)->protect_automation();
 }
 
+/** @param declick 1 to set a pending declick fade-in,
+ *                -1 to set a pending declick fade-out
+ */
 void
 Route::set_pending_declick (int declick)
 {
        if (_declickable) {
-               /* this call is not allowed to turn off a pending declick unless "force" is true */
+               /* this call is not allowed to turn off a pending declick */
                if (declick) {
                        _pending_declick = declick;
                }
-               // cerr << _name << ": after setting to " << declick << " pending declick = " << _pending_declick << endl;
        } else {
                _pending_declick = 0;
        }
-
 }
 
 /** Shift automation forwards from a particular place, thereby inserting time.
@@ -3343,7 +3363,7 @@ Route::shift (framepos_t pos, framecnt_t frames)
 
        /* redirect automation */
        {
-               Glib::RWLock::ReaderLock lm (_processor_lock);
+               Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
                for (ProcessorList::iterator i = _processors.begin (); i != _processors.end (); ++i) {
 
                        set<Evoral::Parameter> parameters = (*i)->what_can_be_automated();
@@ -3443,7 +3463,7 @@ Route::set_name_in_state (XMLNode& node, string const & name)
 boost::shared_ptr<Send>
 Route::internal_send_for (boost::shared_ptr<const Route> target) const
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
                boost::shared_ptr<InternalSend> send;
@@ -3527,7 +3547,7 @@ Route::set_active (bool yn, void* src)
 void
 Route::meter ()
 {
-       Glib::RWLock::ReaderLock rm (_processor_lock, Glib::TRY_LOCK);
+       Glib::Threads::RWLock::ReaderLock rm (_processor_lock, Glib::Threads::TRY_LOCK);
 
        assert (_meter);
 
@@ -3582,7 +3602,7 @@ Route::get_control (const Evoral::Parameter& param)
 
                /* maybe one of our processors does or ... */
 
-               Glib::RWLock::ReaderLock rm (_processor_lock, Glib::TRY_LOCK);
+               Glib::Threads::RWLock::ReaderLock rm (_processor_lock, Glib::Threads::TRY_LOCK);
                for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
                        if ((c = boost::dynamic_pointer_cast<AutomationControl>((*i)->control (param))) != 0) {
                                break;
@@ -3604,7 +3624,7 @@ Route::get_control (const Evoral::Parameter& param)
 boost::shared_ptr<Processor>
 Route::nth_plugin (uint32_t n)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
        ProcessorList::iterator i;
 
        for (i = _processors.begin(); i != _processors.end(); ++i) {
@@ -3621,7 +3641,7 @@ Route::nth_plugin (uint32_t n)
 boost::shared_ptr<Processor>
 Route::nth_send (uint32_t n)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
        ProcessorList::iterator i;
 
        for (i = _processors.begin(); i != _processors.end(); ++i) {
@@ -3638,7 +3658,7 @@ Route::nth_send (uint32_t n)
 bool
 Route::has_io_processor_named (const string& name)
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
        ProcessorList::iterator i;
 
        for (i = _processors.begin(); i != _processors.end(); ++i) {
@@ -3662,7 +3682,7 @@ Route::mute_points () const
 void
 Route::set_processor_positions ()
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
 
        bool had_amp = false;
        for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
@@ -3694,7 +3714,7 @@ Route::unknown_processors () const
 {
        list<string> p;
 
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if (boost::dynamic_pointer_cast<UnknownProcessor const> (*i)) {
                        p.push_back ((*i)->name ());
@@ -3819,7 +3839,7 @@ void
 Route::setup_invisible_processors ()
 {
 #ifndef NDEBUG
-       Glib::RWLock::WriterLock lm (_processor_lock, Glib::TRY_LOCK);
+       Glib::Threads::RWLock::WriterLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
        assert (!lm.locked ());
 #endif
 
@@ -3975,8 +3995,8 @@ Route::setup_invisible_processors ()
 void
 Route::unpan ()
 {
-       Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
-       Glib::RWLock::ReaderLock lp (_processor_lock);
+       Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
+       Glib::Threads::RWLock::ReaderLock lp (_processor_lock);
 
        _pannable.reset ();
 
@@ -4020,7 +4040,7 @@ Route::maybe_note_meter_position ()
 boost::shared_ptr<Processor>
 Route::processor_by_id (PBD::ID id) const
 {
-       Glib::RWLock::ReaderLock lm (_processor_lock);
+       Glib::Threads::RWLock::ReaderLock lm (_processor_lock);
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if ((*i)->id() == id) {
                        return *i;
@@ -4068,7 +4088,7 @@ Route::has_external_redirects () const
 boost::shared_ptr<Processor>
 Route::the_instrument () const
 {
-       Glib::RWLock::WriterLock lm (_processor_lock);
+       Glib::Threads::RWLock::WriterLock lm (_processor_lock);
        for (ProcessorList::const_iterator i = _processors.begin(); i != _processors.end(); ++i) {
                if (boost::dynamic_pointer_cast<PluginInsert>(*i)) {
                        if ((*i)->input_streams().n_midi() > 0 &&
@@ -4079,3 +4099,19 @@ Route::the_instrument () const
        }
        return boost::shared_ptr<Processor>();
 }
+
+void
+Route::non_realtime_locate (framepos_t pos)
+{
+       if (_pannable) {
+               _pannable->transport_located (pos);
+       }
+
+       {
+               Glib::Threads::RWLock::WriterLock lm (_processor_lock);
+               
+               for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+                       (*i)->transport_located (pos);
+               }
+       }
+}