smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

AudioClock: make last_when public and use it instead of current_time

Browse source 
Having current_time as a public alias of the private last_when did not
add any clarity to the abstraction of last_time. A small step, but still
room for improvement.
This commit is contained in:
Mads Kiilerich 2022-11-14 15:52:15 +01:00
parent 498dac3bc8
commit 728e463d01
12 changed files with 33 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

28
gtk2_ardour/audio_clock.cc
View file

@ -782,9 +782,9 @@ AudioClock::end_edit_relative (bool add)
if (!distance.is_zero ()) {
if (add) {
AudioClock::set (current_time() + timepos_t (distance), true);
AudioClock::set (last_when() + timepos_t (distance), true);
} else {
timepos_t c = current_time();
timepos_t c = last_when();
if (c > timepos_t (distance)|| _negative_allowed) {
AudioClock::set (c.earlier (distance), true);
@ -818,7 +818,7 @@ AudioClock::session_configuration_changed (std::string p)
if (is_duration) {
set_duration (current_duration(), true);
} else {
AudioClock::set (current_time(), true);
AudioClock::set (last_when(), true);
}
return;
}
@ -829,7 +829,7 @@ AudioClock::session_configuration_changed (std::string p)
if (is_duration) {
set_duration (current_duration(), true);
} else {
AudioClock::set (current_time(), true);
AudioClock::set (last_when(), true);
}
break;
default:
@ -1817,27 +1817,27 @@ AudioClock::on_scroll_event (GdkEventScroll *ev)
switch (ev->direction) {
case GDK_SCROLL_UP:
step = get_incremental_step (f, current_time());
step = get_incremental_step (f, last_when());
if (!step.is_zero ()) {
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
step *= 10;
}
AudioClock::set (current_time() + step, true);
AudioClock::set (last_when() + step, true);
ValueChanged (); /* EMIT_SIGNAL */
}
break;
case GDK_SCROLL_DOWN:
step = get_incremental_step (f, current_time());
step = get_incremental_step (f, last_when());
if (!step.is_zero ()) {
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
step *= 10;
}
if (!_negative_allowed && current_time() < step) {
if (!_negative_allowed && last_when() < step) {
AudioClock::set (timepos_t (), true);
} else {
AudioClock::set (current_time().earlier (step), true);
AudioClock::set (last_when().earlier (step), true);
}
ValueChanged (); /* EMIT_SIGNAL */
@ -1867,7 +1867,7 @@ AudioClock::on_motion_notify_event (GdkEventMotion *ev)
if (drag_accum) {
timepos_t pos = current_time ();
timepos_t pos = last_when ();
timepos_t step = get_incremental_step (drag_field, pos);
step *= fabs (drag_accum);
@ -1958,12 +1958,6 @@ AudioClock::get_incremental_step (Field field, timepos_t const & pos)
return f;
}
timepos_t
AudioClock::current_time () const
{
return last_when();
}
timecnt_t
AudioClock::current_duration (timepos_t pos) const
{
@ -2238,7 +2232,7 @@ AudioClock::locate ()
return;
}
_session->request_locate (current_time().samples());
_session->request_locate (last_when().samples());
}
void