don't use llrint on already-integral variables
This could trick people into thinking that there is a floating-point type hiding behind the typedef instead of an integer.
This commit is contained in:
parent
0aa2ed582a
commit
16cbecf193
@ -1017,11 +1017,11 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
|
|||||||
|
|
||||||
if (current.beats == 1) {
|
if (current.beats == 1) {
|
||||||
DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Bar at %1|1 @ %2\n", current.bars, current_frame));
|
DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Bar at %1|1 @ %2\n", current.bars, current_frame));
|
||||||
_map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), current.bars, 1));
|
_map.push_back (BBTPoint (*meter, *tempo, current_frame, current.bars, 1));
|
||||||
bar_start_frame = current_frame;
|
bar_start_frame = current_frame;
|
||||||
} else {
|
} else {
|
||||||
DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Beat at %1|%2 @ %3\n", current.bars, current.beats, current_frame));
|
DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Beat at %1|%2 @ %3\n", current.bars, current.beats, current_frame));
|
||||||
_map.push_back (BBTPoint (*meter, *tempo, (framepos_t) llrint(current_frame), current.bars, current.beats));
|
_map.push_back (BBTPoint (*meter, *tempo, current_frame, current.bars, current.beats));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (next_metric == metrics.end()) {
|
if (next_metric == metrics.end()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user