volatile in stupid

[ardour.git] / libs / ardour / session_process.cc

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 0cba1e807cd7ad9c76d89df4c1ff3addefcf597f..05b800fead11b248af4a308ec58047a57ff56528 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -116,6 +116,8 @@ Session::no_roll (pframes_t nframes)
                _click_io->silence (nframes);
        }
 
+       ltc_tx_send_time_code_for_cycle (_transport_frame, end_frame, _target_transport_speed, _transport_speed, nframes);
+
        if (_process_graph) {
                DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/no-roll\n");
                _process_graph->routes_no_roll( nframes, _transport_frame, end_frame, non_realtime_work_pending(), declick);
@@ -341,8 +343,8 @@ Session::process_with_events (pframes_t nframes)
        if (_transport_speed == 1.0) {
                frames_moved = (framecnt_t) nframes;
        } else {
-               interpolation.set_target_speed (fabs(_target_transport_speed));
-               interpolation.set_speed (fabs(_transport_speed));
+               interpolation.set_target_speed (_target_transport_speed);
+               interpolation.set_speed (_transport_speed);
                frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
        }
 
@@ -653,7 +655,10 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame,
 
                        } else {
 
-                               _slave_state = Running;
+                               DEBUG_TRACE (DEBUG::Slave, string_compose ("slave stopped -> running at %1\n", slave_transport_frame));
+
+                               memset (delta_accumulator, 0, sizeof (int32_t) * delta_accumulator_size);
+                               average_slave_delta = 0L;
 
                                Location* al = _locations->auto_loop_location();
 
@@ -663,8 +668,10 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame,
                                }
 
                                if (slave_transport_frame != _transport_frame) {
+                                       DEBUG_TRACE (DEBUG::Slave, string_compose ("require locate to run. eng: %1 -> sl: %2\n", _transport_frame, slave_transport_frame));
                                        locate (slave_transport_frame, false, false);
                                }
+                               _slave_state = Running;
                        }
                        break;
 
@@ -713,9 +720,6 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame,
                                        cerr << "cannot micro-seek\n";
                                        /* XXX what? */
                                }
-
-                               memset (delta_accumulator, 0, sizeof (int32_t) * delta_accumulator_size);
-                               average_slave_delta = 0L;
                        }
                }
 
@@ -738,7 +742,7 @@ Session::track_slave_state (float slave_speed, framepos_t slave_transport_frame,
                        force_locate (slave_transport_frame, false);
                }
 
-               _slave_state = Stopped;
+               reset_slave_state();
        }
 }
 
@@ -787,6 +791,7 @@ Session::process_without_events (pframes_t nframes)
 
        if (!_exporting && _slave) {
                if (!follow_slave (nframes)) {
+                       ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame, 0, 0 , nframes);
                        return;
                }
        }
@@ -799,8 +804,8 @@ Session::process_without_events (pframes_t nframes)
        if (_transport_speed == 1.0) {
                frames_moved = (framecnt_t) nframes;
        } else {
-               interpolation.set_target_speed (fabs(_target_transport_speed));
-               interpolation.set_speed (fabs(_transport_speed));
+               interpolation.set_target_speed (_target_transport_speed);
+               interpolation.set_speed (_transport_speed);
                frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
        }
 
@@ -808,6 +813,8 @@ Session::process_without_events (pframes_t nframes)
                send_midi_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, nframes);
        }
 
+       ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, _target_transport_speed, _transport_speed, nframes);
+
        framepos_t const stop_limit = compute_stop_limit ();
 
        if (maybe_stop (stop_limit)) {
@@ -828,16 +835,6 @@ Session::process_without_events (pframes_t nframes)
 
        get_track_statistics ();
 
-       /* XXX: I'm not sure whether this is correct, but at least it
-          matches process_with_events, so that this new frames_moved
-          is -ve when transport speed is -ve.  This means that the
-          transport position is updated correctly when we are in
-          reverse.  It seems a bit wrong that we're not using the
-          interpolator to compute this.
-       */
-
-       frames_moved = (framecnt_t) floor (_transport_speed * nframes);
-
        if (frames_moved < 0) {
                decrement_transport_position (-frames_moved);
        } else {
@@ -1119,6 +1116,7 @@ Session::process_event (SessionEvent* ev)
                break;
 
        case SessionEvent::SetSyncSource:
+               DEBUG_TRACE (DEBUG::Slave, "seen request for new slave\n");
                use_sync_source (ev->slave);
                break;