ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

rearrange if/else logic to avoid NOTREACHED condition

Browse Source
This commit is contained in:
Paul Davis 2021-03-23 23:53:21 -06:00
parent b84402f4f8
commit 445ad2e383
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libs/temporal/timeline.cc
View File

@ -113,25 +113,21 @@ timecnt_t::end (TimeDomain return_domain) const
}
}
} else { /* _distance in audio time */
} /* else _distance in audio time */
if (_position.time_domain() == AudioTime) {
/* distance & position in audio, so return must be beats (all 3 as audio is handled above) */
return timepos_t (TempoMap::use()->quarters_at_superclock (_position.superclocks() + magnitude()));
if (_position.time_domain() == AudioTime) {
/* distance & position in audio, so return must be beats (all 3 as audio is handled above) */
return timepos_t (TempoMap::use()->quarters_at_superclock (_position.superclocks() + magnitude()));
} else if (_position.time_domain() == BeatTime) {
} /* else if (_position.time_domain() == BeatTime) { */
const superclock_t sc = TempoMap::use()->superclock_at (_position.beats()) + magnitude();
const superclock_t sc = TempoMap::use()->superclock_at (_position.beats()) + magnitude();
if (return_domain == AudioTime) {
return timepos_t::from_superclock (sc);
} else {
return timepos_t (TempoMap::use()->quarters_at_superclock (sc));
}
}
if (return_domain == AudioTime) {
return timepos_t::from_superclock (sc);
}
/*NOTREACHED*/
return timepos_t (TempoMap::use()->quarters_at_superclock (sc));
}
void