changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)
[ardour.git] / libs / ardour / session_process.cc
index b0c838bf8a1dd4befa43ee9c28f784a1f7c1603f..9baa0aea9e81dc6657bb08c8ed3e82b42f0426f9 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 1999-2002 Paul Davis 
+    Copyright (C) 1999-2002 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <algorithm>
 #include <unistd.h>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/enumwriter.h"
 
 #include <glibmm/thread.h>
 
-#include <ardour/ardour.h>
-#include <ardour/session.h>
-#include <ardour/timestamps.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/audioengine.h>
-#include <ardour/slave.h>
-#include <ardour/auditioner.h>
-#include <ardour/cycles.h>
-#include <ardour/cycle_timer.h>
+#include "ardour/ardour.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/audioengine.h"
+#include "ardour/auditioner.h"
+#include "ardour/butler.h"
+#include "ardour/debug.h"
+#include "ardour/session.h"
+#include "ardour/slave.h"
+#include "ardour/timestamps.h"
 
-#include <midi++/manager.h>
+#include "midi++/manager.h"
 
 #include "i18n.h"
 
@@ -50,32 +51,33 @@ using namespace std;
 void
 Session::process (nframes_t nframes)
 {
-       // This is no more the appriopriate place to call cycle
-       // start. cycle_start needs to be called at the Route::roll()
-       // where the signals which we want to mixdown have been calculated.
-       //
        MIDI::Manager::instance()->cycle_start(nframes);
 
        _silent = false;
 
+       if (processing_blocked()) {
+               _silent = true;
+               return;
+       }
+
        if (non_realtime_work_pending()) {
-               if (!transport_work_requested ()) {
+               if (!_butler->transport_work_requested ()) {
                        post_transport ();
-               } 
-       } 
-       
+               }
+       }
+
        (this->*process_function) (nframes);
-       
+
        // the ticker is for sending time information like MidiClock
        nframes_t transport_frames = transport_frame();
        BBT_Time  transport_bbt;
        bbt_time(transport_frames, transport_bbt);
-       SMPTE::Time transport_smpte;
-       smpte_time(transport_frames, transport_smpte);
-       tick (transport_frames, transport_bbt, transport_smpte); /* EMIT SIGNAL */
-       
+       Timecode::Time transport_timecode;
+       timecode_time(transport_frames, transport_timecode);
+       tick (transport_frames, transport_bbt, transport_timecode); /* EMIT SIGNAL */
+
        SendFeedback (); /* EMIT SIGNAL */
-       
+
        MIDI::Manager::instance()->cycle_end();
 }
 
@@ -89,7 +91,13 @@ Session::prepare_diskstreams ()
 }
 
 int
-Session::no_roll (nframes_t nframes, nframes_t offset)
+Session::fail_roll (nframes_t nframes)
+{
+       return no_roll (nframes);
+}
+
+int
+Session::no_roll (nframes_t nframes)
 {
        nframes_t end_frame = _transport_frame + nframes; // FIXME: varispeed + no_roll ??
        int ret = 0;
@@ -97,25 +105,18 @@ Session::no_roll (nframes_t nframes, nframes_t offset)
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        if (_click_io) {
-               _click_io->silence (nframes, offset);
-       }
-
-       if (g_atomic_int_get (&processing_prohibited)) {
-               for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-                       (*i)->silence (nframes, offset);
-               }
-               return 0;
+               _click_io->silence (nframes);
        }
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
-               
+
                if ((*i)->is_hidden()) {
                        continue;
                }
-               
+
                (*i)->set_pending_declick (declick);
-               
-               if ((*i)->no_roll (nframes, _transport_frame, end_frame, offset, non_realtime_work_pending(), 
+
+               if ((*i)->no_roll (nframes, _transport_frame, end_frame, non_realtime_work_pending(),
                                   actively_recording(), declick)) {
                        error << string_compose(_("Session: error in no roll for %1"), (*i)->name()) << endmsg;
                        ret = -1;
@@ -127,7 +128,7 @@ Session::no_roll (nframes_t nframes, nframes_t offset)
 }
 
 int
-Session::process_routes (nframes_t nframes, nframes_t offset)
+Session::process_routes (nframes_t nframes)
 {
        bool record_active;
        int  declick = get_transport_declick_required();
@@ -154,7 +155,7 @@ Session::process_routes (nframes_t nframes, nframes_t offset)
 
                (*i)->set_pending_declick (declick);
 
-               if ((ret = (*i)->roll (nframes, start_frame, end_frame, offset, declick, record_active, rec_monitors)) < 0) {
+               if ((ret = (*i)->roll (nframes, start_frame, end_frame, declick, record_active, rec_monitors)) < 0) {
 
                        /* we have to do this here. Route::roll() for an AudioTrack will have called AudioDiskstream::process(),
                           and the DS will expect AudioDiskstream::commit() to be called. but we're aborting from that
@@ -168,14 +169,14 @@ Session::process_routes (nframes_t nframes, nframes_t offset)
 
                        stop_transport ();
                        return -1;
-               } 
+               }
        }
 
        return 0;
 }
 
 int
-Session::silent_process_routes (nframes_t nframes, nframes_t offset)
+Session::silent_process_routes (nframes_t nframes)
 {
        bool record_active = actively_recording();
        int  declick = get_transport_declick_required();
@@ -186,7 +187,7 @@ Session::silent_process_routes (nframes_t nframes, nframes_t offset)
                /* force a declick out */
                declick = -1;
        }
-       
+
        const nframes_t start_frame = _transport_frame;
        const nframes_t end_frame = _transport_frame + lrintf(nframes * _transport_speed);
 
@@ -198,8 +199,8 @@ Session::silent_process_routes (nframes_t nframes, nframes_t offset)
                        continue;
                }
 
-               if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, offset, record_active, rec_monitors)) < 0) {
-                       
+               if ((ret = (*i)->silent_roll (nframes, start_frame, end_frame, record_active, rec_monitors)) < 0) {
+
                        /* we have to do this here. Route::roll() for an AudioTrack will have called AudioDiskstream::process(),
                           and the DS will expect AudioDiskstream::commit() to be called. but we're aborting from that
                           call path, so make sure we release any outstanding locks here before we return failure.
@@ -212,7 +213,7 @@ Session::silent_process_routes (nframes_t nframes, nframes_t offset)
 
                        stop_transport ();
                        return -1;
-               } 
+               }
        }
 
        return 0;
@@ -231,14 +232,14 @@ Session::commit_diskstreams (nframes_t nframes, bool &needs_butler)
                if ((*i)->hidden()) {
                        continue;
                }
-               
+
                /* force all diskstreams not handled by a Route to call do their stuff.
                   Note: the diskstreams that were handled by a route will just return zero
                   from this call, because they know they were processed. So in fact, this
                   also runs commit() for every diskstream.
                 */
 
-               if ((dret = (*i)->process (_transport_frame, nframes, 0, actively_recording(), get_rec_monitors_input())) == 0) {
+               if ((dret = (*i)->process (_transport_frame, nframes, actively_recording(), get_rec_monitors_input())) == 0) {
                        if ((*i)->commit (nframes)) {
                                needs_butler = true;
                        }
@@ -246,7 +247,7 @@ Session::commit_diskstreams (nframes_t nframes, bool &needs_butler)
                } else if (dret < 0) {
                        (*i)->recover();
                }
-               
+
                pworst = min (pworst, (*i)->playback_buffer_load());
                cworst = min (cworst, (*i)->capture_buffer_load());
        }
@@ -270,18 +271,17 @@ Session::commit_diskstreams (nframes_t nframes, bool &needs_butler)
 void
 Session::process_with_events (nframes_t nframes)
 {
-       Event*         ev;
-       nframes_t this_nframes;
-       nframes_t end_frame;
-       nframes_t offset;
-       bool session_needs_butler = false;
-       nframes_t stop_limit;
+       SessionEvent*         ev;
+       nframes_t      this_nframes;
+       nframes_t      end_frame;
+       bool           session_needs_butler = false;
+       nframes_t      stop_limit;
        long           frames_moved;
-       
+
        /* make sure the auditioner is silent */
 
        if (auditioner) {
-               auditioner->silence (nframes, 0);
+               auditioner->silence (nframes);
        }
 
        /* handle any pending events */
@@ -292,21 +292,22 @@ Session::process_with_events (nframes_t nframes)
 
        /* if we are not in the middle of a state change,
           and there are immediate events queued up,
-          process them. 
+          process them.
        */
 
        while (!non_realtime_work_pending() && !immediate_events.empty()) {
-               Event *ev = immediate_events.front ();
+               SessionEvent *ev = immediate_events.front ();
                immediate_events.pop_front ();
                process_event (ev);
        }
 
-       /* Events caused a transport change, send an MTC Full Frame (SMPTE) message.
+       /* Events caused a transport change, send an MTC Full Frame (Timecode) message.
         * This is sent whether rolling or not, to give slaves an idea of ardour time
         * on locates (and allow slow slaves to position and prepare for rolling)
         */
-       if (_send_smpte_update) {
+       if (_send_timecode_update) {
                send_full_time_code(nframes);
+               deliver_mmc (MIDI::MachineControl::cmdLocate, _transport_frame);
        }
 
        if (!process_can_proceed()) {
@@ -319,28 +320,36 @@ Session::process_with_events (nframes_t nframes)
                return;
        }
 
-       end_frame = _transport_frame + (nframes_t)abs(floor(nframes * _transport_speed));
+       if (_transport_speed == 1.0) {
+               frames_moved = (long) nframes;
+       } else {
+               interpolation.set_target_speed (fabs(_target_transport_speed));
+               interpolation.set_speed (fabs(_transport_speed));
+               frames_moved = (long) interpolation.interpolate (0, nframes, 0, 0);
+       }
+
+       end_frame = _transport_frame + (nframes_t)frames_moved;
 
        {
-               Event* this_event;
+               SessionEvent* this_event;
                Events::iterator the_next_one;
-               
+
                if (!process_can_proceed()) {
                        _silent = true;
                        return;
                }
-               
+
                if (!_exporting && _slave) {
-                       if (!follow_slave (nframes, 0)) {
+                       if (!follow_slave (nframes)) {
                                return;
                        }
-               } 
+               }
 
                if (_transport_speed == 0) {
-                       no_roll (nframes, 0);
+                       no_roll (nframes);
                        return;
                }
-       
+
                if (!_exporting) {
                        send_midi_time_code_for_cycle (nframes);
                }
@@ -357,18 +366,18 @@ Session::process_with_events (nframes_t nframes)
                }
 
                if (maybe_stop (stop_limit)) {
-                       no_roll (nframes, 0);
+                       no_roll (nframes);
                        return;
-               } 
+               }
 
                this_event = *next_event;
                the_next_one = next_event;
                ++the_next_one;
 
-               offset = 0;
-
                /* yes folks, here it is, the actual loop where we really truly
-                  process some audio */
+                  process some audio
+               */
+
                while (nframes) {
 
                        this_nframes = nframes; /* real (jack) time relative */
@@ -379,25 +388,24 @@ Session::process_with_events (nframes_t nframes)
                                /* this isn't quite right for reverse play */
                                frames_moved = (long) (this_event->action_frame - _transport_frame);
                                this_nframes = (nframes_t) abs( floor(frames_moved / _transport_speed) );
-                       } 
+                       }
 
                        if (this_nframes) {
-                               
-                               click (_transport_frame, nframes, offset);
-                               
+
+                               click (_transport_frame, this_nframes);
+
                                /* now process frames between now and the first event in this block */
                                prepare_diskstreams ();
 
-                               if (process_routes (this_nframes, offset)) {
-                                       no_roll (nframes, 0);
+                               if (process_routes (this_nframes)) {
+                                       fail_roll (nframes);
                                        return;
                                }
-                               
+
                                commit_diskstreams (this_nframes, session_needs_butler);
 
                                nframes -= this_nframes;
-                               offset += this_nframes;
-                               
+
                                if (frames_moved < 0) {
                                        decrement_transport_position (-frames_moved);
                                } else {
@@ -408,8 +416,10 @@ Session::process_with_events (nframes_t nframes)
                                check_declick_out ();
                        }
 
+                       _engine.split_cycle (this_nframes);
+
                        /* now handle this event and all others scheduled for the same time */
-                       
+
                        while (this_event && this_event->action_frame == _transport_frame) {
                                process_event (this_event);
 
@@ -419,26 +429,27 @@ Session::process_with_events (nframes_t nframes)
                                        this_event = *the_next_one;
                                        ++the_next_one;
                                }
-                       } 
+                       }
 
                        /* if an event left our state changing, do the right thing */
 
-                       if (non_realtime_work_pending()) {
-                               no_roll (nframes, offset);
+                       if (nframes && non_realtime_work_pending()) {
+                               no_roll (nframes);
                                break;
                        }
 
                        /* this is necessary to handle the case of seamless looping */
                        end_frame = _transport_frame + (nframes_t) floor (nframes * _transport_speed);
-                       
+
                }
 
                set_next_event ();
 
        } /* implicit release of route lock */
 
-       if (session_needs_butler)
-               summon_butler ();
+       if (session_needs_butler) {
+               _butler->summon ();
+       }
 }
 
 void
@@ -447,7 +458,7 @@ Session::reset_slave_state ()
        average_slave_delta = 1800;
        delta_accumulator_cnt = 0;
        have_first_delta_accumulator = false;
-       slave_state = Stopped;
+       _slave_state = Stopped;
 }
 
 bool
@@ -455,7 +466,7 @@ Session::transport_locked () const
 {
        Slave* sl = _slave;
 
-       if (!locate_pending() && ((Config->get_slave_source() == None) || (sl && sl->ok() && sl->locked()))) {
+       if (!locate_pending() && (!config.get_external_sync() || (sl && sl->ok() && sl->locked()))) {
                return true;
        }
 
@@ -463,23 +474,25 @@ Session::transport_locked () const
 }
 
 bool
-Session::follow_slave (nframes_t nframes, nframes_t offset)
+Session::follow_slave (nframes_t nframes)
 {
-       float slave_speed;
-       nframes_t slave_transport_frame;
+       double slave_speed;
+       nframes64_t slave_transport_frame;
        nframes_t this_delta;
        int dir;
-       bool starting;
 
        if (!_slave->ok()) {
                stop_transport ();
-               Config->set_slave_source (None);
+               config.set_external_sync (false);
                goto noroll;
        }
-       
+
        _slave->speed_and_position (slave_speed, slave_transport_frame);
 
+       DEBUG_TRACE (DEBUG::Slave, string_compose ("Slave position %1 speed %2\n", slave_transport_frame, slave_speed));
+
        if (!_slave->locked()) {
+               DEBUG_TRACE (DEBUG::Slave, "slave not locked\n");
                goto noroll;
        }
 
@@ -491,141 +504,102 @@ Session::follow_slave (nframes_t nframes, nframes_t offset)
                dir = -1;
        }
 
-       if ((starting = _slave->starting())) {
+       if (_slave->starting()) {
                slave_speed = 0.0f;
        }
 
-       if (_slave->is_always_synced() || Config->get_timecode_source_is_synced()) {
+       if (_slave->is_always_synced() || config.get_timecode_source_is_synced()) {
 
-               /* if the TC source is synced, then we assume that its 
+               /* if the TC source is synced, then we assume that its
                   speed is binary: 0.0 or 1.0
                */
 
                if (slave_speed != 0.0f) {
                        slave_speed = 1.0f;
-               } 
+               }
 
        } else {
 
-               /* TC source is able to drift relative to us (slave)
-                  so we need to keep track of the drift and adjust
-                  our speed to remain locked.
+               /* if we are chasing and the average delta between us and the
+                  master gets too big, we want to switch to silent
+                  motion. so keep track of that here.
                */
 
-               calculate_moving_average_of_slave_delta(dir, this_delta);
+               if (_slave_state == Running) {
+                       calculate_moving_average_of_slave_delta(dir, this_delta);
+               }
        }
-       
-       track_slave_state(slave_speed, slave_transport_frame, this_delta, starting);
 
-       if (slave_state == Running && !_slave->is_always_synced() && !Config->get_timecode_source_is_synced()) {
+       track_slave_state (slave_speed, slave_transport_frame, this_delta);
+
+       DEBUG_TRACE (DEBUG::Slave, string_compose ("slave state %1 @ %2 speed %3 cur delta %4 avg delta %5\n",
+                                                  _slave_state, slave_transport_frame, slave_speed, this_delta, average_slave_delta));
+                    
+
+       if (_slave_state == Running && !_slave->is_always_synced() && !config.get_timecode_source_is_synced()) {
 
                if (_transport_speed != 0.0f) {
-                       
-                       /* 
-                          note that average_dir is +1 or -1 
+
+                       /*
+                          note that average_dir is +1 or -1
                        */
-                       
+
                        float delta;
 
-                       #ifdef USE_MOVING_AVERAGE_OF_SLAVE
-                               if (average_slave_delta == 0) {
-                                       delta = this_delta;
-                                       delta *= dir;
-                               } else {
-                                       delta = average_slave_delta;
-                                       delta *= average_dir;
-                               }
-                       #else
+                       if (average_slave_delta == 0) {
                                delta = this_delta;
                                delta *= dir;
-                       #endif
+                       } else {
+                               delta = average_slave_delta;
+                               delta *= average_dir;
+                       }
 
-                       float adjusted_speed = slave_speed +
-                               (delta /  float(_current_frame_rate));
-                       
-                       #ifdef DEBUG_SLAVES
-                       cerr << "adjust using " << delta
-                            << " towards " << adjusted_speed
-                            << " ratio = " << adjusted_speed / slave_speed
-                            << " current = " << _transport_speed
-                            << " slave @ " << slave_speed
-                            << endl;
-                       #endif
+#ifndef NDEBUG
+                       if (slave_speed != 0.0) {
+                               DEBUG_TRACE (DEBUG::Slave, string_compose ("delta = %1 speed = %2 ts = %3 M@%4 S@%5 avgdelta %6\n",
+                                                                          (int) (dir * this_delta),
+                                                                          slave_speed,
+                                                                          _transport_speed,
+                                                                          _transport_frame,
+                                                                          slave_transport_frame, 
+                                                                          average_slave_delta));
+                       }
+#endif
                        
-                       request_transport_speed (adjusted_speed);
+                       if (_slave->give_slave_full_control_over_transport_speed()) {
+                               set_transport_speed (slave_speed, false, false);
+                               //std::cout << "set speed = " << slave_speed << "\n";
+                       } else {
+                               float adjusted_speed = slave_speed + (1.5 * (delta /  float(_current_frame_rate)));
+                               request_transport_speed (adjusted_speed);
+                               DEBUG_TRACE (DEBUG::Slave, string_compose ("adjust using %1 towards %2 ratio %3 current %4 slave @ %5\n",
+                                                                          delta, adjusted_speed, adjusted_speed/slave_speed, _transport_speed,
+                                                                          slave_speed));
+                       }
                        
-                       if (abs(average_slave_delta) > (long) _slave->resolution()) {
-                               cerr << "average slave delta greater than slave resolution, going to silent motion\n";
+#if 1
+                       if ((nframes_t) abs(average_slave_delta) > _slave->resolution()) {
+                               cerr << "average slave delta greater than slave resolution (" << _slave->resolution() << "), going to silent motion\n";
                                goto silent_motion;
                        }
+#endif
                }
-       } 
-       
-       #ifdef DEBUG_SLAVES
-       if (slave_speed != 0.0)
-       cerr << "delta = " << (int) (dir * this_delta)
-                << " speed = " << slave_speed 
-                << " ts = " << _transport_speed 
-                << " M@ "<< slave_transport_frame << " S@ " << _transport_frame 
-                << " avgdelta = " << average_slave_delta 
-                << endl;
-       #endif  
-
-       if (!starting && !non_realtime_work_pending()) {
+       }
+
+
+       if (_slave_state == Running && !non_realtime_work_pending()) {
                /* speed is set, we're locked, and good to go */
                return true;
        }
 
   silent_motion:
-#ifdef DEBUG_SLAVES    
-       cerr << "reached silent_motion:" <<endl;
-#endif
-       
-       if (slave_speed && _transport_speed) {
-
-               /* something isn't right, but we should move with the master
-                  for now.
-               */
-
-               bool need_butler;
-               
-               prepare_diskstreams ();
-               silent_process_routes (nframes, offset);
-               commit_diskstreams (nframes, need_butler);
-
-               if (need_butler) {
-                       summon_butler ();
-               }
-               
-               int32_t frames_moved = (int32_t) floor (_transport_speed * nframes);
-               
-               if (frames_moved < 0) {
-                       decrement_transport_position (-frames_moved);
-               } else {
-                       increment_transport_position (frames_moved);
-               }
-               
-               nframes_t stop_limit;
-               
-               if (actively_recording()) {
-                       stop_limit = max_frames;
-               } else {
-                       if (Config->get_stop_at_session_end()) {
-                               stop_limit = current_end_frame();
-                       } else {
-                               stop_limit = max_frames;
-                       }
-               }
-
-               maybe_stop (stop_limit);
-       }
+       DEBUG_TRACE (DEBUG::Slave, "silent motion\n")
+       follow_slave_silently (nframes, slave_speed);
 
   noroll:
        /* don't move at all */
-#ifdef DEBUG_SLAVES    
-       cerr << "reached no_roll:" <<endl;
-#endif
-       no_roll (nframes, 0);
+       DEBUG_TRACE (DEBUG::Slave, "no roll\n")
+       no_roll (nframes);
        return false;
 }
 
@@ -640,7 +614,7 @@ Session::calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta)
        if (delta_accumulator_cnt != 0 || this_delta < _current_frame_rate) {
                delta_accumulator[delta_accumulator_cnt++] = long(dir) * long(this_delta);
        }
-       
+
        if (have_first_delta_accumulator) {
                average_slave_delta = 0L;
                for (int i = 0; i < delta_accumulator_size; ++i) {
@@ -657,27 +631,24 @@ Session::calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta)
 }
 
 void
-Session::track_slave_state(
-               float slave_speed, 
-               nframes_t slave_transport_frame, 
-               nframes_t this_delta,
-               bool starting)
+Session::track_slave_state (float slave_speed, nframes_t slave_transport_frame, nframes_t this_delta)
 {
        if (slave_speed != 0.0f) {
 
                /* slave is running */
 
-               switch (slave_state) {
+               switch (_slave_state) {
                case Stopped:
                        if (_slave->requires_seekahead()) {
-                               slave_wait_end = slave_transport_frame + _current_frame_rate;
+                               slave_wait_end = slave_transport_frame + _slave->seekahead_distance ();
+                               DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stopped, but running, requires seekahead to %1\n", slave_wait_end));
+                               /* we can call locate() here because we are in process context */
                                locate (slave_wait_end, false, false);
-                               slave_state = Waiting;
-                               starting = true;
+                               _slave_state = Waiting;
 
                        } else {
 
-                               slave_state = Running;
+                               _slave_state = Running;
 
                                Location* al = _locations.auto_loop_location();
 
@@ -693,29 +664,30 @@ Session::track_slave_state(
                        break;
 
                case Waiting:
-                       break;
-
                default:
                        break;
-
                }
 
-               if (slave_state == Waiting) {
+               if (_slave_state == Waiting) {
+
+                       DEBUG_TRACE (DEBUG::Slave, string_compose ("slave waiting at %1\n", slave_transport_frame));
 
-#ifdef DEBUG_SLAVES
-                       cerr << "waiting at " << slave_transport_frame << endl;
-#endif                 
                        if (slave_transport_frame >= slave_wait_end) {
-#ifdef DEBUG_SLAVES
-                               cerr << "\tstart at " << _transport_frame << endl;
-#endif
-                               slave_state = Running;
+
+                               DEBUG_TRACE (DEBUG::Slave, string_compose ("slave start at %1 vs %2\n", slave_transport_frame, _transport_frame));
+
+                               _slave_state = Running;
+
+                               /* now perform a "micro-seek" within the disk buffers to realign ourselves
+                                  precisely with the master.
+                               */
+
 
                                bool ok = true;
                                nframes_t frame_delta = slave_transport_frame - _transport_frame;
 
                                boost::shared_ptr<DiskstreamList> dsl = diskstreams.reader();
-                               
+
                                for (DiskstreamList::iterator i = dsl->begin(); i != dsl->end(); ++i) {
                                        if (!(*i)->can_internal_playback_seek (frame_delta)) {
                                                ok = false;
@@ -728,7 +700,7 @@ Session::track_slave_state(
                                                (*i)->internal_playback_seek (frame_delta);
                                        }
                                        _transport_frame += frame_delta;
-                                      
+
                                } else {
                                        cerr << "cannot micro-seek\n";
                                        /* XXX what? */
@@ -739,41 +711,70 @@ Session::track_slave_state(
                                this_delta = 0;
                        }
                }
-               
-               if (slave_state == Running && _transport_speed == 0.0f) {
-                       
-#ifdef DEBUG_SLAVES
-                       cerr << "slave starts transport\n";
-#endif
+
+               if (_slave_state == Running && _transport_speed == 0.0f) {
+                       DEBUG_TRACE (DEBUG::Slave, "slave starts transport\n");
                        start_transport ();
-               } 
+               }
 
        } else { // slave_speed is 0
 
                /* slave has stopped */
 
                if (_transport_speed != 0.0f) {
-
-#ifdef DEBUG_SLAVES
-                       cerr << "slave stops transport: " << slave_speed << " frame: " << slave_transport_frame 
-                            << " tf = " << _transport_frame << endl;
-#endif
-                       
-                       if (Config->get_slave_source() == JACK) {
-                               last_stop_frame = _transport_frame;
-                       }
-
+                       DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stops transport: %1 frame %2 tf %3\n", slave_speed, slave_transport_frame, _transport_frame));
                        stop_transport();
                }
 
                if (slave_transport_frame != _transport_frame) {
-#ifdef DEBUG_SLAVES                    
-                       cerr << "slave stopped, move to " << slave_transport_frame << endl;
-#endif
+                       DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stopped, move to %1\n", slave_transport_frame));
                        force_locate (slave_transport_frame, false);
                }
 
-               slave_state = Stopped;
+               _slave_state = Stopped;
+       }
+}
+
+void
+Session::follow_slave_silently (nframes_t nframes, float slave_speed)
+{
+       if (slave_speed && _transport_speed) {
+
+               /* something isn't right, but we should move with the master
+                  for now.
+               */
+
+               bool need_butler;
+
+               prepare_diskstreams ();
+               silent_process_routes (nframes);
+               commit_diskstreams (nframes, need_butler);
+
+               if (need_butler) {
+                       _butler->summon ();
+               }
+
+               int32_t frames_moved = (int32_t) floor (_transport_speed * nframes);
+
+               if (frames_moved < 0) {
+                       decrement_transport_position (-frames_moved);
+               } else {
+                       increment_transport_position (frames_moved);
+               }
+
+               nframes_t stop_limit;
+
+               if (actively_recording()) {
+                       stop_limit = max_frames;
+               } else {
+                       if (Config->get_stop_at_session_end()) {
+                               stop_limit = current_end_frame();
+                       } else {
+                               stop_limit = max_frames;
+                       }
+               }
+
+               maybe_stop (stop_limit);
        }
 }
 
@@ -783,7 +784,6 @@ Session::process_without_events (nframes_t nframes)
        bool session_needs_butler = false;
        nframes_t stop_limit;
        long frames_moved;
-       nframes_t offset = 0;
 
        if (!process_can_proceed()) {
                _silent = true;
@@ -791,16 +791,16 @@ Session::process_without_events (nframes_t nframes)
        }
 
        if (!_exporting && _slave) {
-               if (!follow_slave (nframes, 0)) {
+               if (!follow_slave (nframes)) {
                        return;
                }
-       } 
+       }
 
        if (_transport_speed == 0) {
-               no_roll (nframes, 0);
+               fail_roll (nframes);
                return;
        }
-               
+
        if (!_exporting) {
                send_midi_time_code_for_cycle (nframes);
        }
@@ -814,24 +814,30 @@ Session::process_without_events (nframes_t nframes)
                        stop_limit = max_frames;
                }
        }
-               
+
        if (maybe_stop (stop_limit)) {
-               no_roll (nframes, 0);
+               fail_roll (nframes);
                return;
-       } 
+       }
 
-       if (maybe_sync_start (nframes, offset)) {
+       if (maybe_sync_start (nframes)) {
                return;
        }
 
-       click (_transport_frame, nframes, offset);
+       click (_transport_frame, nframes);
 
        prepare_diskstreams ();
-       
-       frames_moved = (long) floor (_transport_speed * nframes);
 
-       if (process_routes (nframes, offset)) {
-               no_roll (nframes, offset);
+       if (_transport_speed == 1.0) {
+               frames_moved = (long) nframes;
+       } else {
+               interpolation.set_target_speed (fabs(_target_transport_speed));
+               interpolation.set_speed (fabs(_transport_speed));
+               frames_moved = (long) interpolation.interpolate (0, nframes, 0, 0);
+       }
+
+       if (process_routes (nframes)) {
+               fail_roll (nframes);
                return;
        }
 
@@ -846,8 +852,9 @@ Session::process_without_events (nframes_t nframes)
        maybe_stop (stop_limit);
        check_declick_out ();
 
-       if (session_needs_butler)
-               summon_butler ();
+       if (session_needs_butler) {
+               _butler->summon ();
+       }
 }
 
 /** Process callback used when the auditioner is active.
@@ -856,20 +863,20 @@ Session::process_without_events (nframes_t nframes)
 void
 Session::process_audition (nframes_t nframes)
 {
-       Event* ev;
+       SessionEvent* ev;
        boost::shared_ptr<RouteList> r = routes.reader ();
 
        for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
                if (!(*i)->is_hidden()) {
-                       (*i)->silence (nframes, 0);
+                       (*i)->silence (nframes);
                }
        }
 
        /* run the auditioner, and if it says we need butler service, ask for it */
-       
+
        if (auditioner->play_audition (nframes) > 0) {
-               summon_butler ();
-       } 
+               _butler->summon ();
+       }
 
        /* handle pending events */
 
@@ -879,11 +886,11 @@ Session::process_audition (nframes_t nframes)
 
        /* if we are not in the middle of a state change,
           and there are immediate events queued up,
-          process them. 
+          process them.
        */
 
        while (!non_realtime_work_pending() && !immediate_events.empty()) {
-               Event *ev = immediate_events.front ();
+               SessionEvent *ev = immediate_events.front ();
                immediate_events.pop_front ();
                process_event (ev);
        }
@@ -895,7 +902,7 @@ Session::process_audition (nframes_t nframes)
 }
 
 bool
-Session::maybe_sync_start (nframes_t& nframes, nframes_t& offset)
+Session::maybe_sync_start (nframes_t& nframes)
 {
        nframes_t sync_offset;
 
@@ -910,25 +917,23 @@ Session::maybe_sync_start (nframes_t& nframes, nframes_t& offset)
                   is left to do.
                */
 
-               no_roll (sync_offset, 0);
+               no_roll (sync_offset);
                nframes -= sync_offset;
-               offset += sync_offset;
+               Port::increment_port_offset (sync_offset);
                waiting_for_sync_offset = false;
-               
+
                if (nframes == 0) {
                        return true; // done, nothing left to process
                }
-               
+
        } else {
 
                /* sync offset point is not within this process()
-                  cycle, so just generate silence. and don't bother 
+                  cycle, so just generate silence. and don't bother
                   with any fancy stuff here, just the minimal silence.
                */
 
-               g_atomic_int_inc (&processing_prohibited);
-               no_roll (nframes, 0);
-               g_atomic_int_dec_and_test (&processing_prohibited);
+               _silent = true;
 
                if (Config->get_locate_while_waiting_for_sync()) {
                        if (micro_locate (nframes)) {
@@ -942,3 +947,197 @@ Session::maybe_sync_start (nframes_t& nframes, nframes_t& offset)
        return false;
 }
 
+void
+Session::queue_event (SessionEvent* ev)
+{
+       if (_state_of_the_state & Deletion) {
+               return;
+       } else if (_state_of_the_state & Loading) {
+               merge_event (ev);
+       } else {
+               pending_events.write (&ev, 1);
+       }
+}
+
+void
+Session::set_next_event ()
+{
+       if (events.empty()) {
+               next_event = events.end();
+               return;
+       }
+
+       if (next_event == events.end()) {
+               next_event = events.begin();
+       }
+
+       if ((*next_event)->action_frame > _transport_frame) {
+               next_event = events.begin();
+       }
+
+       for (; next_event != events.end(); ++next_event) {
+               if ((*next_event)->action_frame >= _transport_frame) {
+                       break;
+               }
+       }
+}
+
+void
+Session::process_event (SessionEvent* ev)
+{
+       bool remove = true;
+       bool del = true;
+
+       /* if we're in the middle of a state change (i.e. waiting
+          for the butler thread to complete the non-realtime
+          part of the change), we'll just have to queue this
+          event for a time when the change is complete.
+       */
+
+       if (non_realtime_work_pending()) {
+
+               /* except locates, which we have the capability to handle */
+
+               if (ev->type != SessionEvent::Locate) {
+                       immediate_events.insert (immediate_events.end(), ev);
+                       _remove_event (ev);
+                       return;
+               }
+       }
+
+       DEBUG_TRACE (DEBUG::SessionEvents, string_compose ("Processing event: %1 @ %2\n", enum_2_string (ev->type), _transport_frame));
+
+       switch (ev->type) {
+       case SessionEvent::SetLoop:
+               set_play_loop (ev->yes_or_no);
+               break;
+
+       case SessionEvent::AutoLoop:
+               if (play_loop) {
+                       start_locate (ev->target_frame, true, false, Config->get_seamless_loop());
+               }
+               remove = false;
+               del = false;
+               break;
+
+       case SessionEvent::Locate:
+               if (ev->yes_or_no) {
+                       // cerr << "forced locate to " << ev->target_frame << endl;
+                       locate (ev->target_frame, false, true, false);
+               } else {
+                       // cerr << "soft locate to " << ev->target_frame << endl;
+                       start_locate (ev->target_frame, false, true, false);
+               }
+               _send_timecode_update = true;
+               break;
+
+       case SessionEvent::LocateRoll:
+               if (ev->yes_or_no) {
+                       // cerr << "forced locate to+roll " << ev->target_frame << endl;
+                       locate (ev->target_frame, true, true, false);
+               } else {
+                       // cerr << "soft locate to+roll " << ev->target_frame << endl;
+                       start_locate (ev->target_frame, true, true, false);
+               }
+               _send_timecode_update = true;
+               break;
+
+       case SessionEvent::LocateRollLocate:
+               // locate is handled by ::request_roll_at_and_return()
+               _requested_return_frame = ev->target_frame;
+               request_locate (ev->target2_frame, true);
+               break;
+
+
+       case SessionEvent::SetTransportSpeed:
+               set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no);
+               break;
+
+       case SessionEvent::PunchIn:
+               // cerr << "PunchIN at " << transport_frame() << endl;
+               if (config.get_punch_in() && record_status() == Enabled) {
+                       enable_record ();
+               }
+               remove = false;
+               del = false;
+               break;
+
+       case SessionEvent::PunchOut:
+               // cerr << "PunchOUT at " << transport_frame() << endl;
+               if (config.get_punch_out()) {
+                       step_back_from_record ();
+               }
+               remove = false;
+               del = false;
+               break;
+
+       case SessionEvent::StopOnce:
+               if (!non_realtime_work_pending()) {
+                       stop_transport (ev->yes_or_no);
+                       _clear_event_type (SessionEvent::StopOnce);
+               }
+               remove = false;
+               del = false;
+               break;
+
+       case SessionEvent::RangeStop:
+               if (!non_realtime_work_pending()) {
+                       stop_transport (ev->yes_or_no);
+               }
+               remove = false;
+               del = false;
+               break;
+
+       case SessionEvent::RangeLocate:
+               start_locate (ev->target_frame, true, true, false);
+               remove = false;
+               del = false;
+               break;
+
+       case SessionEvent::Overwrite:
+               overwrite_some_buffers (static_cast<Diskstream*>(ev->ptr));
+               break;
+
+       case SessionEvent::SetDiskstreamSpeed:
+               set_diskstream_speed (static_cast<Diskstream*> (ev->ptr), ev->speed);
+               break;
+
+       case SessionEvent::SetSyncSource:
+               use_sync_source (ev->slave);
+               break;
+
+       case SessionEvent::Audition:
+               set_audition (ev->region);
+               // drop reference to region
+               ev->region.reset ();
+               break;
+
+       case SessionEvent::InputConfigurationChange:
+               add_post_transport_work (PostTransportInputChange);
+               _butler->schedule_transport_work ();
+               break;
+
+       case SessionEvent::SetPlayAudioRange:
+               set_play_range (ev->audio_range, (ev->speed == 1.0f));
+               break;
+
+       case SessionEvent::RealTimeOperation:
+               process_rtop (ev);
+               del = false; // other side of RT request needs to clean up
+               break;
+
+       default:
+         fatal << string_compose(_("Programming error: illegal event type in process_event (%1)"), ev->type) << endmsg;
+               /*NOTREACHED*/
+               break;
+       };
+
+       if (remove) {
+               del = del && !_remove_event (ev);
+       }
+
+       if (del) {
+               delete ev;
+       }
+}
+