#include "pbd/error.h"
#include "pbd/enumwriter.h"
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "ardour/audioengine.h"
#include "ardour/auditioner.h"
_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);
PT_TIMING_CHECK (10);
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if ((*i)->is_hidden()) {
+ if ((*i)->is_auditioner()) {
continue;
}
const framepos_t start_frame = _transport_frame;
const framepos_t end_frame = _transport_frame + floor (nframes * _transport_speed);
-
+
if (_process_graph) {
DEBUG_TRACE(DEBUG::ProcessThreads,"calling graph/process-routes\n");
_process_graph->process_routes (nframes, start_frame, end_frame, declick, need_butler);
int ret;
- if ((*i)->is_hidden()) {
+ if ((*i)->is_auditioner()) {
continue;
}
int ret;
- if ((*i)->is_hidden()) {
+ if ((*i)->is_auditioner()) {
continue;
}
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);
}
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() && (dynamic_cast<TimecodeSlave*>(_slave)) != 0)
+ ) {
/* if the TC source is synced, then we assume that its
speed is binary: 0.0 or 1.0
_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 (_slave_state == Running && !_slave->is_always_synced() &&
+ !(Config->get_timecode_source_is_synced() && (dynamic_cast<TimecodeSlave*>(_slave)) != 0)
+ ) {
if (_transport_speed != 0.0f) {
}
#if 1
- if ((framecnt_t) abs(average_slave_delta) > _slave->resolution()) {
+ if (!actively_recording() && (framecnt_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;
}
} 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();
}
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;
cerr << "cannot micro-seek\n";
/* XXX what? */
}
-
- memset (delta_accumulator, 0, sizeof (int32_t) * delta_accumulator_size);
- average_slave_delta = 0L;
}
}
force_locate (slave_transport_frame, false);
}
- _slave_state = Stopped;
+ reset_slave_state();
}
}
if (!_exporting && _slave) {
if (!follow_slave (nframes)) {
+ ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame, 0, 0 , nframes);
return;
}
}
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);
}
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)) {
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 {
boost::shared_ptr<RouteList> r = routes.reader ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- if (!(*i)->is_hidden()) {
+ if (!(*i)->is_auditioner()) {
(*i)->silence (nframes);
}
}
/* if using a monitor section, run it because otherwise we don't hear anything */
if (auditioner->needs_monitor()) {
- _monitor_out->passthru (_transport_frame, _transport_frame + nframes, nframes, false);
+ _monitor_out->monitor_run (_transport_frame, _transport_frame + nframes, nframes, false);
}
/* handle pending events */
case SessionEvent::AutoLoop:
if (play_loop) {
+ /* roll after locate, do not flush, set "with loop"
+ true only if we are seamless looping
+ */
start_locate (ev->target_frame, true, false, Config->get_seamless_loop());
}
remove = false;
case SessionEvent::Locate:
if (ev->yes_or_no) {
- // cerr << "forced locate to " << ev->target_frame << endl;
+ /* args: do not roll after locate, do flush, not with loop */
locate (ev->target_frame, false, true, false);
} else {
- // cerr << "soft locate to " << ev->target_frame << endl;
+ /* args: do not roll after locate, do flush, not with loop */
start_locate (ev->target_frame, false, true, false);
}
_send_timecode_update = true;
case SessionEvent::LocateRoll:
if (ev->yes_or_no) {
- // cerr << "forced locate to+roll " << ev->target_frame << endl;
+ /* args: roll after locate, do flush, not with loop */
locate (ev->target_frame, true, true, false);
} else {
- // cerr << "soft locate to+roll " << ev->target_frame << endl;
+ /* args: roll after locate, do flush, not with loop */
start_locate (ev->target_frame, true, true, false);
}
_send_timecode_update = true;
case SessionEvent::SetTransportSpeed:
- set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no);
+ set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no, ev->third_yes_or_no);
break;
case SessionEvent::PunchIn:
break;
case SessionEvent::RangeLocate:
+ /* args: roll after locate, do flush, not with loop */
start_locate (ev->target_frame, true, true, false);
remove = false;
del = false;
break;
case SessionEvent::SetSyncSource:
+ DEBUG_TRACE (DEBUG::Slave, "seen request for new slave\n");
use_sync_source (ev->slave);
break;
if (!Config->get_stop_at_session_end ()) {
return max_framepos;
}
+
+ if (_slave) {
+ return max_framepos;
+ }
+
bool const punching_in = (config.get_punch_in () && _locations->auto_punch_location());
bool const punching_out = (config.get_punch_out () && _locations->auto_punch_location());
projects / ardour.git / blobdiff