summaryrefslogtreecommitdiff
path: root/libs/ardour/session_transport.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
commit30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch)
tree620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/session_transport.cc
parentcb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff)
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible
Diffstat (limited to 'libs/ardour/session_transport.cc')
-rw-r--r--libs/ardour/session_transport.cc248
1 files changed, 124 insertions, 124 deletions
diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index dee6e97c17..95a6683a05 100644
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -127,24 +127,24 @@ Session::request_transport_speed_nonzero (double speed, bool as_default)
void
Session::request_stop (bool abort, bool clear_state)
{
- SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, audible_frame(), 0.0, abort, clear_state);
- DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, audible %3 transport %4 abort = %1, clear state = %2\n", abort, clear_state, audible_frame(), _transport_frame));
+ SessionEvent* ev = new SessionEvent (SessionEvent::SetTransportSpeed, SessionEvent::Add, SessionEvent::Immediate, audible_sample(), 0.0, abort, clear_state);
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, audible %3 transport %4 abort = %1, clear state = %2\n", abort, clear_state, audible_sample(), _transport_sample));
queue_event (ev);
}
void
-Session::request_locate (framepos_t target_frame, bool with_roll)
+Session::request_locate (samplepos_t target_sample, bool with_roll)
{
- SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_frame, 0, false);
- DEBUG_TRACE (DEBUG::Transport, string_compose ("Request locate to %1\n", target_frame));
+ SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_sample, 0, false);
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("Request locate to %1\n", target_sample));
queue_event (ev);
}
void
-Session::force_locate (framepos_t target_frame, bool with_roll)
+Session::force_locate (samplepos_t target_sample, bool with_roll)
{
- SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_frame, 0, true);
- DEBUG_TRACE (DEBUG::Transport, string_compose ("Request forced locate to %1\n", target_frame));
+ SessionEvent *ev = new SessionEvent (with_roll ? SessionEvent::LocateRoll : SessionEvent::Locate, SessionEvent::Add, SessionEvent::Immediate, target_sample, 0, true);
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("Request forced locate to %1\n", target_sample));
queue_event (ev);
}
@@ -164,14 +164,14 @@ Session::unset_preroll_record_trim ()
}
void
-Session::request_preroll_record_punch (framepos_t rec_in, framecnt_t preroll)
+Session::request_preroll_record_punch (samplepos_t rec_in, samplecnt_t preroll)
{
if (actively_recording ()) {
return;
}
unset_preroll_record_punch ();
unset_preroll_record_trim ();
- framepos_t start = std::max ((framepos_t)0, rec_in - preroll);
+ samplepos_t start = std::max ((samplepos_t)0, rec_in - preroll);
_preroll_record_punch_pos = rec_in;
if (_preroll_record_punch_pos >= 0) {
@@ -181,11 +181,11 @@ Session::request_preroll_record_punch (framepos_t rec_in, framecnt_t preroll)
}
maybe_enable_record ();
request_locate (start, true);
- set_requested_return_frame (rec_in);
+ set_requested_return_sample (rec_in);
}
void
-Session::request_preroll_record_trim (framepos_t rec_in, framecnt_t preroll)
+Session::request_preroll_record_trim (samplepos_t rec_in, samplecnt_t preroll)
{
if (actively_recording ()) {
return;
@@ -196,11 +196,11 @@ Session::request_preroll_record_trim (framepos_t rec_in, framecnt_t preroll)
config.set_punch_in (false);
config.set_punch_out (false);
- framepos_t pos = std::max ((framepos_t)0, rec_in - preroll);
+ samplepos_t pos = std::max ((samplepos_t)0, rec_in - preroll);
_preroll_record_trim_len = preroll;
maybe_enable_record ();
request_locate (pos, true);
- set_requested_return_frame (rec_in);
+ set_requested_return_sample (rec_in);
}
void
@@ -272,7 +272,7 @@ Session::request_play_loop (bool yn, bool change_transport_roll)
if (!change_transport_roll && Config->get_seamless_loop() && transport_rolling()) {
// request an immediate locate to refresh the tracks
// after disabling looping
- request_locate (_transport_frame-1, false);
+ request_locate (_transport_sample-1, false);
}
}
}
@@ -301,7 +301,7 @@ Session::request_cancel_play_range ()
void
Session::realtime_stop (bool abort, bool clear_state)
{
- DEBUG_TRACE (DEBUG::Transport, string_compose ("realtime stop @ %1\n", _transport_frame));
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("realtime stop @ %1\n", _transport_sample));
PostTransportWork todo = PostTransportWork (0);
/* assume that when we start, we'll be moving forwards */
@@ -321,7 +321,7 @@ Session::realtime_stop (bool abort, bool clear_state)
(*i)->realtime_handle_transport_stopped ();
}
- DEBUG_TRACE (DEBUG::Transport, string_compose ("stop complete, auto-return scheduled for return to %1\n", _requested_return_frame));
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("stop complete, auto-return scheduled for return to %1\n", _requested_return_sample));
/* the duration change is not guaranteed to have happened, but is likely */
@@ -436,11 +436,11 @@ Session::butler_transport_work ()
tr->adjust_playback_buffering ();
/* and refill those buffers ... */
}
- (*i)->non_realtime_locate (_transport_frame);
+ (*i)->non_realtime_locate (_transport_sample);
}
VCAList v = _vca_manager->vcas ();
for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
- (*i)->non_realtime_locate (_transport_frame);
+ (*i)->non_realtime_locate (_transport_sample);
}
}
@@ -473,7 +473,7 @@ Session::butler_transport_work ()
if (!(ptw & PostTransportLocate)) {
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- (*i)->non_realtime_locate (_transport_frame);
+ (*i)->non_realtime_locate (_transport_sample);
if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) {
/* new request, stop seeking, and start again */
@@ -483,7 +483,7 @@ Session::butler_transport_work ()
}
VCAList v = _vca_manager->vcas ();
for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
- (*i)->non_realtime_locate (_transport_frame);
+ (*i)->non_realtime_locate (_transport_sample);
}
}
}
@@ -515,7 +515,7 @@ Session::butler_transport_work ()
g_atomic_int_dec_and_test (&_butler->should_do_transport_work);
- DEBUG_TRACE (DEBUG::Transport, string_compose (X_("Butler transport work all done after %1 usecs @ %2 trw = %3\n"), g_get_monotonic_time() - before, _transport_frame, _butler->transport_work_requested()));
+ DEBUG_TRACE (DEBUG::Transport, string_compose (X_("Butler transport work all done after %1 usecs @ %2 trw = %3\n"), g_get_monotonic_time() - before, _transport_sample, _butler->transport_work_requested()));
}
void
@@ -550,21 +550,21 @@ Session::non_realtime_overwrite (int on_entry, bool& finished)
void
Session::non_realtime_locate ()
{
- DEBUG_TRACE (DEBUG::Transport, string_compose ("locate tracks to %1\n", _transport_frame));
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("locate tracks to %1\n", _transport_sample));
if (Config->get_loop_is_mode() && get_play_loop()) {
Location *loc = _locations->auto_loop_location();
- if (!loc || (_transport_frame < loc->start() || _transport_frame >= loc->end())) {
+ if (!loc || (_transport_sample < loc->start() || _transport_sample >= loc->end())) {
/* jumped out of loop range: stop tracks from looping,
but leave loop (mode) enabled.
*/
set_track_loop (false);
} else if (loc && Config->get_seamless_loop() &&
- ((loc->start() <= _transport_frame) ||
- (loc->end() > _transport_frame) ) ) {
+ ((loc->start() <= _transport_sample) ||
+ (loc->end() > _transport_sample) ) ) {
/* jumping to start of loop. This might have been done before but it is
* idempotent and cheap. Doing it here ensures that when we start playback
@@ -583,14 +583,14 @@ Session::non_realtime_locate ()
}
- framepos_t tf;
+ samplepos_t tf;
{
boost::shared_ptr<RouteList> rl = routes.reader();
restart:
gint sc = g_atomic_int_get (&_seek_counter);
- tf = _transport_frame;
+ tf = _transport_sample;
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
(*i)->non_realtime_locate (tf);
@@ -603,7 +603,7 @@ Session::non_realtime_locate ()
{
/* VCAs are quick to locate because they have no data (except
automation) associated with them. Don't bother with a
- restart mechanism here, but do use the same transport frame
+ restart mechanism here, but do use the same transport sample
that the Routes used.
*/
VCAList v = _vca_manager->vcas ();
@@ -612,7 +612,7 @@ Session::non_realtime_locate ()
}
}
- _scene_changer->locate (_transport_frame);
+ _scene_changer->locate (_transport_sample);
/* XXX: it would be nice to generate the new clicks here (in the non-RT thread)
rather than clearing them so that the RT thread has to spend time constructing
@@ -623,7 +623,7 @@ Session::non_realtime_locate ()
#ifdef USE_TRACKS_CODE_FEATURES
bool
-Session::select_playhead_priority_target (framepos_t& jump_to)
+Session::select_playhead_priority_target (samplepos_t& jump_to)
{
jump_to = -1;
@@ -699,7 +699,7 @@ Session::select_playhead_priority_target (framepos_t& jump_to)
#else
bool
-Session::select_playhead_priority_target (framepos_t& jump_to)
+Session::select_playhead_priority_target (samplepos_t& jump_to)
{
if (config.get_external_sync() || !config.get_auto_return()) {
return false;
@@ -714,7 +714,7 @@ Session::select_playhead_priority_target (framepos_t& jump_to)
void
Session::follow_playhead_priority ()
{
- framepos_t target;
+ samplepos_t target;
if (select_playhead_priority_target (target)) {
request_locate (target);
@@ -736,7 +736,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
boost::shared_ptr<RouteList> rl = routes.reader();
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
- if (tr && tr->get_captured_frames () != 0) {
+ if (tr && tr->get_captured_samples () != 0) {
did_record = true;
break;
}
@@ -799,11 +799,11 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
PostTransportWork ptw = post_transport_work ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
- (*i)->non_realtime_transport_stop (_transport_frame, !(ptw & PostTransportLocate) || pending_locate_flush);
+ (*i)->non_realtime_transport_stop (_transport_sample, !(ptw & PostTransportLocate) || pending_locate_flush);
}
VCAList v = _vca_manager->vcas ();
for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
- (*i)->non_realtime_transport_stop (_transport_frame, !(ptw & PostTransportLocate) || pending_locate_flush);
+ (*i)->non_realtime_transport_stop (_transport_sample, !(ptw & PostTransportLocate) || pending_locate_flush);
}
update_latency_compensation ();
@@ -813,7 +813,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
if (auto_return_enabled ||
(ptw & PostTransportLocate) ||
- (_requested_return_frame >= 0) ||
+ (_requested_return_sample >= 0) ||
synced_to_engine()) {
if (pending_locate_flush) {
@@ -821,42 +821,42 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
}
// rg: what is the logic behind this case?
- // _requested_return_frame should be ignored when synced_to_engine/slaved.
- // currently worked around in MTC_Slave by forcing _requested_return_frame to -1
+ // _requested_return_sample should be ignored when synced_to_engine/slaved.
+ // currently worked around in MTC_Slave by forcing _requested_return_sample to -1
// 2016-01-10
- if ((auto_return_enabled || synced_to_engine() || _requested_return_frame >= 0) &&
+ if ((auto_return_enabled || synced_to_engine() || _requested_return_sample >= 0) &&
!(ptw & PostTransportLocate)) {
/* no explicit locate queued */
bool do_locate = false;
- if (_requested_return_frame >= 0) {
+ if (_requested_return_sample >= 0) {
/* explicit return request pre-queued in event list. overrides everything else */
- _transport_frame = _requested_return_frame;
+ _transport_sample = _requested_return_sample;
do_locate = true;
} else {
- framepos_t jump_to;
+ samplepos_t jump_to;
if (select_playhead_priority_target (jump_to)) {
- _transport_frame = jump_to;
+ _transport_sample = jump_to;
do_locate = true;
} else if (abort) {
- _transport_frame = _last_roll_location;
+ _transport_sample = _last_roll_location;
do_locate = true;
}
}
- _requested_return_frame = -1;
+ _requested_return_sample = -1;
if (do_locate) {
- _engine.transport_locate (_transport_frame);
+ _engine.transport_locate (_transport_sample);
}
}
@@ -881,7 +881,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
DEBUG_TRACE (DEBUG::Transport, X_("Butler PTW: locate\n"));
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
DEBUG_TRACE (DEBUG::Transport, string_compose ("Butler PTW: locate on %1\n", (*i)->name()));
- (*i)->non_realtime_locate (_transport_frame);
+ (*i)->non_realtime_locate (_transport_sample);
if (on_entry != g_atomic_int_get (&_butler->should_do_transport_work)) {
finished = false;
@@ -894,7 +894,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
{
VCAList v = _vca_manager->vcas ();
for (VCAList::const_iterator i = v.begin(); i != v.end(); ++i) {
- (*i)->non_realtime_locate (_transport_frame);
+ (*i)->non_realtime_locate (_transport_sample);
}
}
@@ -917,7 +917,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
Something must be done. XXX
*/
- send_mmc_locate (_transport_frame);
+ send_mmc_locate (_transport_sample);
}
}
@@ -953,10 +953,10 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
}
}
- PositionChanged (_transport_frame); /* EMIT SIGNAL */
+ PositionChanged (_transport_sample); /* EMIT SIGNAL */
DEBUG_TRACE (DEBUG::Transport, string_compose ("send TSC with speed = %1\n", _transport_speed));
TransportStateChange (); /* EMIT SIGNAL */
- AutomationWatch::instance().transport_stop_automation_watches (_transport_frame);
+ AutomationWatch::instance().transport_stop_automation_watches (_transport_sample);
/* and start it up again if relevant */
@@ -985,7 +985,7 @@ Session::check_declick_out ()
if (transport_sub_state & PendingDeclickOut) {
if (locate_required) {
- start_locate (pending_locate_frame, pending_locate_roll, pending_locate_flush);
+ start_locate (pending_locate_sample, pending_locate_roll, pending_locate_flush);
transport_sub_state &= ~(PendingDeclickOut|PendingLocate);
} else {
if (!(transport_sub_state & StopPendingCapture)) {
@@ -1085,8 +1085,8 @@ Session::set_play_loop (bool yn, double speed)
in a fade-in when the loop restarts. The AutoLoop event will peform the actual loop.
*/
- framepos_t dcp;
- framecnt_t dcl;
+ samplepos_t dcp;
+ samplecnt_t dcl;
auto_loop_declick_range (loc, dcp, dcl);
merge_event (new SessionEvent (SessionEvent::AutoLoopDeclick, SessionEvent::Replace, dcp, dcl, 0.0f));
merge_event (new SessionEvent (SessionEvent::AutoLoop, SessionEvent::Replace, loc->end(), loc->start(), 0.0f));
@@ -1130,9 +1130,9 @@ Session::flush_all_inserts ()
}
void
-Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_loop_enabled, bool force)
+Session::start_locate (samplepos_t target_sample, bool with_roll, bool with_flush, bool for_loop_enabled, bool force)
{
- if (target_frame < 0) {
+ if (target_sample < 0) {
error << _("Locate called for negative sample position - ignored") << endmsg;
return;
}
@@ -1140,25 +1140,25 @@ Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush,
if (synced_to_engine()) {
double sp;
- framepos_t pos;
+ samplepos_t pos;
_slave->speed_and_position (sp, pos);
- if (target_frame != pos) {
+ if (target_sample != pos) {
if (config.get_jack_time_master()) {
/* actually locate now, since otherwise jack_timebase_callback
- will use the incorrect _transport_frame and report an old
+ will use the incorrect _transport_sample and report an old
and incorrect time to Jack transport
*/
- locate (target_frame, with_roll, with_flush, for_loop_enabled, force);
+ locate (target_sample, with_roll, with_flush, for_loop_enabled, force);
}
/* tell JACK to change transport position, and we will
follow along later in ::follow_slave()
*/
- _engine.transport_locate (target_frame);
+ _engine.transport_locate (target_sample);
if (sp != 1.0f && with_roll) {
_engine.transport_start ();
@@ -1167,12 +1167,12 @@ Session::start_locate (framepos_t target_frame, bool with_roll, bool with_flush,
}
} else {
- locate (target_frame, with_roll, with_flush, for_loop_enabled, force);
+ locate (target_sample, with_roll, with_flush, for_loop_enabled, force);
}
}
int
-Session::micro_locate (framecnt_t distance)
+Session::micro_locate (samplecnt_t distance)
{
boost::shared_ptr<RouteList> rl = routes.reader();
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
@@ -1189,13 +1189,13 @@ Session::micro_locate (framecnt_t distance)
}
}
- _transport_frame += distance;
+ _transport_sample += distance;
return 0;
}
/** @param with_mmc true to send a MMC locate command when the locate is done */
void
-Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_loop_enabled, bool force, bool with_mmc)
+Session::locate (samplepos_t target_sample, bool with_roll, bool with_flush, bool for_loop_enabled, bool force, bool with_mmc)
{
bool need_butler = false;
@@ -1204,13 +1204,13 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
* already have the correct data in them, and thus there is no need to
* actually tell the tracks to locate. What does need to be done,
* though, is all the housekeeping that is associated with non-linear
- * changes in the value of _transport_frame.
+ * changes in the value of _transport_sample.
*/
DEBUG_TRACE (DEBUG::Transport, string_compose ("rt-locate to %1, roll %2 flush %3 loop-enabled %4 force %5 mmc %6\n",
- target_frame, with_roll, with_flush, for_loop_enabled, force, with_mmc));
+ target_sample, with_roll, with_flush, for_loop_enabled, force, with_mmc));
- if (!force && _transport_frame == target_frame && !loop_changing && !for_loop_enabled) {
+ if (!force && _transport_sample == target_sample && !loop_changing && !for_loop_enabled) {
/* already at the desired position. Not forced to locate,
the loop isn't changing, so unless we're told to
@@ -1234,7 +1234,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
if (!(transport_sub_state & PendingDeclickOut)) {
transport_sub_state |= (PendingDeclickOut|PendingLocate);
- pending_locate_frame = target_frame;
+ pending_locate_sample = target_sample;
pending_locate_roll = with_roll;
pending_locate_flush = with_flush;
cerr << "Declick scheduled ... back soon\n";
@@ -1245,12 +1245,12 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
cerr << "... now doing the actual locate\n";
// Update Timecode time
- _transport_frame = target_frame;
+ _transport_sample = target_sample;
// Bump seek counter so that any in-process locate in the butler
// thread(s?) can restart.
g_atomic_int_inc (&_seek_counter);
- _last_roll_or_reversal_location = target_frame;
- timecode_time(_transport_frame, transmitting_timecode_time);
+ _last_roll_or_reversal_location = target_sample;
+ timecode_time(_transport_sample, transmitting_timecode_time);
/* do "stopped" stuff if:
*
@@ -1317,7 +1317,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
Location* al = _locations->auto_loop_location();
if (al) {
- if (_transport_frame < al->start() || _transport_frame >= al->end()) {
+ if (_transport_sample < al->start() || _transport_sample >= al->end()) {
// located outside the loop: cancel looping directly, this is called from event handling context
@@ -1335,7 +1335,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
}
}
- } else if (_transport_frame == al->start()) {
+ } else if (_transport_sample == al->start()) {
// located to start of loop - this is looping, basically
@@ -1359,7 +1359,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
if (tr && tr->rec_enable_control()->get_value()) {
// tell it we've looped, so it can deal with the record state
- tr->transport_looped (_transport_frame);
+ tr->transport_looped (_transport_sample);
}
}
@@ -1378,11 +1378,11 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
_send_timecode_update = true;
if (with_mmc) {
- send_mmc_locate (_transport_frame);
+ send_mmc_locate (_transport_sample);
}
- _last_roll_location = _last_roll_or_reversal_location = _transport_frame;
- if (!synced_to_engine () || _transport_frame == _engine.transport_frame ()) {
+ _last_roll_location = _last_roll_or_reversal_location = _transport_sample;
+ if (!synced_to_engine () || _transport_sample == _engine.transport_sample ()) {
Located (); /* EMIT SIGNAL */
}
}
@@ -1392,10 +1392,10 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
* @param speed New speed
*/
void
-Session::set_transport_speed (double speed, framepos_t destination_frame, bool abort, bool clear_state, bool as_default)
+Session::set_transport_speed (double speed, samplepos_t destination_sample, bool abort, bool clear_state, bool as_default)
{
DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n",
- speed, abort, clear_state, _transport_speed, _transport_frame, as_default));
+ speed, abort, clear_state, _transport_speed, _transport_sample, as_default));
if (_transport_speed == speed) {
if (as_default && speed == 0.0) { // => reset default transport speed. hacky or what?
@@ -1406,8 +1406,8 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a
if (actively_recording() && speed != 1.0 && speed != 0.0) {
/* no varispeed during recording */
- DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, frame %2\n",
- _transport_speed, _transport_frame));
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, sample %2\n",
+ _transport_speed, _transport_sample));
return;
}
@@ -1445,7 +1445,7 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a
bool const auto_return_enabled = (!config.get_external_sync() && (Config->get_auto_return_target_list() || abort));
if (!auto_return_enabled) {
- _requested_return_frame = destination_frame;
+ _requested_return_sample = destination_sample;
}
stop_transport (abort);
@@ -1462,7 +1462,7 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a
Location *location = _locations->auto_loop_location();
if (location != 0) {
- if (_transport_frame != location->start()) {
+ if (_transport_sample != location->start()) {
if (Config->get_seamless_loop()) {
/* force tracks to do their thing */
@@ -1504,11 +1504,11 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a
return;
}
- if (speed > 0.0 && _transport_frame == current_end_frame()) {
+ if (speed > 0.0 && _transport_sample == current_end_sample()) {
return;
}
- if (speed < 0.0 && _transport_frame == 0) {
+ if (speed < 0.0 && _transport_sample == 0) {
return;
}
@@ -1522,7 +1522,7 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a
if ((_transport_speed && speed * _transport_speed < 0.0) || (_last_transport_speed * speed < 0.0) || (_last_transport_speed == 0.0 && speed < 0.0)) {
todo = PostTransportWork (todo | PostTransportReverse);
- _last_roll_or_reversal_location = _transport_frame;
+ _last_roll_or_reversal_location = _transport_sample;
}
_last_transport_speed = _transport_speed;
@@ -1588,12 +1588,12 @@ Session::stop_transport (bool abort, bool clear_state)
/* stop has not yet been scheduled */
boost::shared_ptr<RouteList> rl = routes.reader();
- framepos_t stop_target = audible_frame();
+ samplepos_t stop_target = audible_sample();
for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> (*i);
if (tr) {
- tr->prepare_to_stop (_transport_frame, stop_target);
+ tr->prepare_to_stop (_transport_sample, stop_target);
}
}
@@ -1613,12 +1613,12 @@ Session::stop_transport (bool abort, bool clear_state)
*/
DEBUG_TRACE (DEBUG::Transport, string_compose ("stop transport requested @ %1, scheduled for + %2 = %3, abort = %4\n",
- _transport_frame, _worst_input_latency,
- _transport_frame + _worst_input_latency,
+ _transport_sample, _worst_input_latency,
+ _transport_sample + _worst_input_latency,
abort));
SessionEvent *ev = new SessionEvent (SessionEvent::StopOnce, SessionEvent::Replace,
- _transport_frame + _worst_input_latency,
+ _transport_sample + _worst_input_latency,
0, 0, abort);
merge_event (ev);
@@ -1635,7 +1635,7 @@ Session::stop_transport (bool abort, bool clear_state)
/* Not recording, schedule a declick in the next process() cycle and then stop at its end */
new_bits = PendingDeclickOut;
- DEBUG_TRACE (DEBUG::Transport, string_compose ("stop scheduled for next process cycle @ %1\n", _transport_frame));
+ DEBUG_TRACE (DEBUG::Transport, string_compose ("stop scheduled for next process cycle @ %1\n", _transport_sample));
}
/* we'll be called again after the declick */
@@ -1664,8 +1664,8 @@ Session::start_transport ()
{
DEBUG_TRACE (DEBUG::Transport, "start_transport\n");
- _last_roll_location = _transport_frame;
- _last_roll_or_reversal_location = _transport_frame;
+ _last_roll_location = _transport_sample;
+ _last_roll_or_reversal_location = _transport_sample;
have_looped = false;
@@ -1705,7 +1705,7 @@ Session::start_transport ()
if (!_engine.freewheeling()) {
Timecode::Time time;
- timecode_time_subframes (_transport_frame, time);
+ timecode_time_subframes (_transport_sample, time);
if (!dynamic_cast<MTC_Slave*>(_slave)) {
send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdDeferredPlay));
}
@@ -1713,18 +1713,18 @@ Session::start_transport ()
if (actively_recording() && click_data && (config.get_count_in () || _count_in_once)) {
_count_in_once = false;
/* calculate count-in duration (in audio samples)
- * - use [fixed] tempo/meter at _transport_frame
- * - calc duration of 1 bar + time-to-beat before or at transport_frame
+ * - use [fixed] tempo/meter at _transport_sample
+ * - calc duration of 1 bar + time-to-beat before or at transport_sample
*/
- const Tempo& tempo = _tempo_map->tempo_at_frame (_transport_frame);
- const Meter& meter = _tempo_map->meter_at_frame (_transport_frame);
+ const Tempo& tempo = _tempo_map->tempo_at_sample (_transport_sample);
+ const Meter& meter = _tempo_map->meter_at_sample (_transport_sample);
const double num = meter.divisions_per_bar ();
const double den = meter.note_divisor ();
- const double barbeat = _tempo_map->exact_qn_at_frame (_transport_frame, 0) * den / (4. * num);
+ const double barbeat = _tempo_map->exact_qn_at_sample (_transport_sample, 0) * den / (4. * num);
const double bar_fract = fmod (barbeat, 1.0); // fraction of bar elapsed.
- _count_in_samples = meter.frames_per_bar (tempo, _current_frame_rate);
+ _count_in_samples = meter.samples_per_bar (tempo, _current_sample_rate);
double dt = _count_in_samples / num;
if (bar_fract == 0) {
@@ -1736,8 +1736,8 @@ Session::start_transport ()
}
int clickbeat = 0;
- framepos_t cf = _transport_frame - _count_in_samples;
- while (cf < _transport_frame) {
+ samplepos_t cf = _transport_sample - _count_in_samples;
+ while (cf < _transport_sample) {
add_click (cf - _worst_track_latency, clickbeat == 0);
cf += dt;
clickbeat = fmod (clickbeat + 1, num);
@@ -1788,15 +1788,15 @@ Session::post_transport ()
}
void
-Session::reset_rf_scale (framecnt_t motion)
+Session::reset_rf_scale (samplecnt_t motion)
{
cumulative_rf_motion += motion;
- if (cumulative_rf_motion < 4 * _current_frame_rate) {
+ if (cumulative_rf_motion < 4 * _current_sample_rate) {
rf_scale = 1;
- } else if (cumulative_rf_motion < 8 * _current_frame_rate) {
+ } else if (cumulative_rf_motion < 8 * _current_sample_rate) {
rf_scale = 4;
- } else if (cumulative_rf_motion < 16 * _current_frame_rate) {
+ } else if (cumulative_rf_motion < 16 * _current_sample_rate) {
rf_scale = 10;
} else {
rf_scale = 100;
@@ -2012,18 +2012,18 @@ Session::set_play_range (list<AudioRange>& range, bool leave_rolling)
/* locating/stopping is subject to delays for declicking.
*/
- framepos_t requested_frame = i->end;
+ samplepos_t requested_sample = i->end;
- if (requested_frame > current_block_size) {
- requested_frame -= current_block_size;
+ if (requested_sample > current_block_size) {
+ requested_sample -= current_block_size;
} else {
- requested_frame = 0;
+ requested_sample = 0;
}
if (next == range.end()) {
- ev = new SessionEvent (SessionEvent::RangeStop, SessionEvent::Add, requested_frame, 0, 0.0f);
+ ev = new SessionEvent (SessionEvent::RangeStop, SessionEvent::Add, requested_sample, 0, 0.0f);
} else {
- ev = new SessionEvent (SessionEvent::RangeLocate, SessionEvent::Add, requested_frame, (*next).start, 0.0f);
+ ev = new SessionEvent (SessionEvent::RangeLocate, SessionEvent::Add, requested_sample, (*next).start, 0.0f);
}
merge_event (ev);
@@ -2052,7 +2052,7 @@ Session::set_play_range (list<AudioRange>& range, bool leave_rolling)
}
void
-Session::request_bounded_roll (framepos_t start, framepos_t end)
+Session::request_bounded_roll (samplepos_t start, samplepos_t end)
{
AudioRange ar (start, end, 0);
list<AudioRange> lar;
@@ -2062,16 +2062,16 @@ Session::request_bounded_roll (framepos_t start, framepos_t end)
}
void
-Session::set_requested_return_frame (framepos_t return_to)
+Session::set_requested_return_sample (samplepos_t return_to)
{
- _requested_return_frame = return_to;
+ _requested_return_sample = return_to;
}
void
-Session::request_roll_at_and_return (framepos_t start, framepos_t return_to)
+Session::request_roll_at_and_return (samplepos_t start, samplepos_t return_to)
{
SessionEvent *ev = new SessionEvent (SessionEvent::LocateRollLocate, SessionEvent::Add, SessionEvent::Immediate, return_to, 1.0);
- ev->target2_frame = start;
+ ev->target2_sample = start;
queue_event (ev);
}
@@ -2105,7 +2105,7 @@ Session::xrun_recovery ()
{
++_xrun_count;
- Xrun (_transport_frame); /* EMIT SIGNAL */
+ Xrun (_transport_sample); /* EMIT SIGNAL */
if (Config->get_stop_recording_on_xrun() && actively_recording()) {
@@ -2147,9 +2147,9 @@ Session::allow_auto_play (bool yn)
}
bool
-Session::maybe_stop (framepos_t limit)
+Session::maybe_stop (samplepos_t limit)
{
- if ((_transport_speed > 0.0f && _transport_frame >= limit) || (_transport_speed < 0.0f && _transport_frame == 0)) {
+ if ((_transport_speed > 0.0f && _transport_sample >= limit) || (_transport_speed < 0.0f && _transport_sample == 0)) {
if (synced_to_engine () && config.get_jack_time_master ()) {
_engine.transport_stop ();
} else if (!synced_to_engine ()) {
@@ -2161,7 +2161,7 @@ Session::maybe_stop (framepos_t limit)
}
void
-Session::send_mmc_locate (framepos_t t)
+Session::send_mmc_locate (samplepos_t t)
{
if (t < 0) {
return;