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

libevoral: remove semi-shadow local variable

Browse source
This commit is contained in:
Paul Davis 2021-02-18 15:16:18 -07:00
parent 0162d3f9d6
commit 87e56f28e9
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/evoral/Sequence.cc
View file

@ -360,7 +360,6 @@ Sequence<Time>::const_iterator::operator++()
}
Temporal::timepos_t x (Temporal::AudioTime);
Temporal::timepos_t xtime (Temporal::AudioTime);
double y = 0.0;
bool ret = false;
@ -375,14 +374,14 @@ Sequence<Time>::const_iterator::operator++()
case CONTROL:
// Increment current controller iterator
if (_force_discrete || _control_iter->list->interpolation() == ControlList::Discrete) {
ret = _control_iter->list->rt_safe_earliest_event_discrete_unlocked (_control_iter->x, xtime, y, false);
ret = _control_iter->list->rt_safe_earliest_event_discrete_unlocked (_control_iter->x, x, y, false);
} else {
ret = _control_iter->list->rt_safe_earliest_event_linear_unlocked (
_control_iter->x, xtime, y, false, Temporal::timecnt_t::from_ticks (time_between_interpolated_controller_outputs.to_ticks()));
_control_iter->x, x, y, false, Temporal::timecnt_t::from_ticks (time_between_interpolated_controller_outputs.to_ticks()));
}
assert(!ret || x > _control_iter->x);
if (ret) {
_control_iter->x = xtime;
_control_iter->x = x;
_control_iter->y = y;
} else {
_control_iter->x = Temporal::timepos_t::max (_control_iter->list->time_domain());