sort of no-op ... remove debug output ... just basically put it in git so that i can fetch it on another machine
This commit is contained in:
parent
f8de3e0c6e
commit
eeeb8563c2
@ -839,13 +839,11 @@ Session::process_without_events (pframes_t nframes)
|
|||||||
if (!_exporting && _slave) {
|
if (!_exporting && _slave) {
|
||||||
if (!follow_slave (nframes)) {
|
if (!follow_slave (nframes)) {
|
||||||
ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame, 0, 0 , nframes);
|
ltc_tx_send_time_code_for_cycle (_transport_frame, _transport_frame, 0, 0 , nframes);
|
||||||
cerr << "p-WO-E: FS fail\n";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_transport_speed == 0) {
|
if (_transport_speed == 0) {
|
||||||
cerr << "p-WO-E: ts = 0\n";
|
|
||||||
no_roll (nframes);
|
no_roll (nframes);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -856,11 +854,8 @@ Session::process_without_events (pframes_t nframes)
|
|||||||
interpolation.set_target_speed (_target_transport_speed);
|
interpolation.set_target_speed (_target_transport_speed);
|
||||||
interpolation.set_speed (_transport_speed);
|
interpolation.set_speed (_transport_speed);
|
||||||
frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
|
frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
|
||||||
cerr << "p-WO-E: current speed : " << _transport_speed << " interpolate says " << frames_moved << endl;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cerr << "p-WO-E: will move " << frames_moved << endl;
|
|
||||||
|
|
||||||
if (!_exporting && !timecode_transmission_suspended()) {
|
if (!_exporting && !timecode_transmission_suspended()) {
|
||||||
send_midi_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, nframes);
|
send_midi_time_code_for_cycle (_transport_frame, _transport_frame + frames_moved, nframes);
|
||||||
}
|
}
|
||||||
@ -870,20 +865,17 @@ Session::process_without_events (pframes_t nframes)
|
|||||||
framepos_t const stop_limit = compute_stop_limit ();
|
framepos_t const stop_limit = compute_stop_limit ();
|
||||||
|
|
||||||
if (maybe_stop (stop_limit)) {
|
if (maybe_stop (stop_limit)) {
|
||||||
cerr << "p-WO-E: mebbe stop\n";
|
|
||||||
no_roll (nframes);
|
no_roll (nframes);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (maybe_sync_start (nframes)) {
|
if (maybe_sync_start (nframes)) {
|
||||||
cerr << "p-WO-E: sync start said no\n";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
click (_transport_frame, nframes);
|
click (_transport_frame, nframes);
|
||||||
|
|
||||||
if (process_routes (nframes, session_needs_butler)) {
|
if (process_routes (nframes, session_needs_butler)) {
|
||||||
cerr << "p-WO-E: pr failed\n";
|
|
||||||
fail_roll (nframes);
|
fail_roll (nframes);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -896,8 +888,6 @@ Session::process_without_events (pframes_t nframes)
|
|||||||
increment_transport_position (frames_moved);
|
increment_transport_position (frames_moved);
|
||||||
}
|
}
|
||||||
|
|
||||||
cerr << "p-WO-E: ts now " << _transport_frame << endl;
|
|
||||||
|
|
||||||
maybe_stop (stop_limit);
|
maybe_stop (stop_limit);
|
||||||
check_declick_out ();
|
check_declick_out ();
|
||||||
|
|
||||||
@ -1093,7 +1083,7 @@ Session::process_event (SessionEvent* ev)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case SessionEvent::Locate:
|
case SessionEvent::Locate:
|
||||||
if (ev->yes_or_no) {
|
if (ev->yes_or_no) { /* force locate */
|
||||||
/* args: do not roll after locate, do flush, not with loop */
|
/* args: do not roll after locate, do flush, not with loop */
|
||||||
locate (ev->target_frame, false, true, false);
|
locate (ev->target_frame, false, true, false);
|
||||||
} else {
|
} else {
|
||||||
|
@ -593,10 +593,12 @@ Session::non_realtime_locate ()
|
|||||||
gint sc = g_atomic_int_get (&_seek_counter);
|
gint sc = g_atomic_int_get (&_seek_counter);
|
||||||
tf = _transport_frame;
|
tf = _transport_frame;
|
||||||
|
|
||||||
cerr << "\n\n >>> START Non-RT locate on routes to " << tf << "\n\n";
|
cerr << "\n\n >>> START Non-RT locate on routes to " << tf << " counter = " << sc << "\n\n";
|
||||||
|
|
||||||
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
|
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
|
||||||
(*i)->non_realtime_locate (tf);
|
(*i)->non_realtime_locate (tf);
|
||||||
|
//::usleep (250000);
|
||||||
|
cerr << "\t\tcounter after track: " << g_atomic_int_get (&_seek_counter) << endl;
|
||||||
if (sc != g_atomic_int_get (&_seek_counter)) {
|
if (sc != g_atomic_int_get (&_seek_counter)) {
|
||||||
cerr << "\n\n RESTART locate, new seek delivered\n";
|
cerr << "\n\n RESTART locate, new seek delivered\n";
|
||||||
goto restart;
|
goto restart;
|
||||||
@ -1246,10 +1248,13 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
|
|||||||
pending_locate_frame = target_frame;
|
pending_locate_frame = target_frame;
|
||||||
pending_locate_roll = with_roll;
|
pending_locate_roll = with_roll;
|
||||||
pending_locate_flush = with_flush;
|
pending_locate_flush = with_flush;
|
||||||
|
cerr << "Declick scheduled ... back soon\n";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cerr << "... now doing the actual locate\n";
|
||||||
|
|
||||||
// Update Timecode time
|
// Update Timecode time
|
||||||
_transport_frame = target_frame;
|
_transport_frame = target_frame;
|
||||||
// Bump seek counter so that any in-process locate in the butler
|
// Bump seek counter so that any in-process locate in the butler
|
||||||
|
Loading…
Reference in New Issue
Block a user