don't use llrint on already-integral variables
authorDevin J. Pohly <djpohly@gmail.com>
Wed, 14 May 2014 06:59:25 +0000 (02:59 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Wed, 14 May 2014 16:11:14 +0000 (12:11 -0400)
This could trick people into thinking that there is a floating-point
type hiding behind the typedef instead of an integer.

libs/ardour/tempo.cc

index a2a400ad32bad2e8f719d0110510e957e3d05eef..621d1e2c747d0d30bfe4322184cee1db044b8b54 100644 (file)
@@ -1017,11 +1017,11 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
 
                if (current.beats == 1) {
                        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;
                } else {
                        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()) {