globally remove all trailing whitespace from ardour code base.

[ardour.git] / libs / timecode / src / bbt_time.cc

diff --git a/libs/timecode/src/bbt_time.cc b/libs/timecode/src/bbt_time.cc
index 6de822524d3ffc35b5e5d5652879474de8bcdae5..b2cf9dadfe5dff4688a18435b716f9896ac29c32 100644 (file)
--- a/libs/timecode/src/bbt_time.cc
+++ b/libs/timecode/src/bbt_time.cc
@@ -5,12 +5,12 @@
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2 of the License, or (at your
   option) any later version.
-  
+
   This program is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
   License for more details.
-  
+
   You should have received a copy of the GNU Lesser General Public License
   along with this program; if not, write to the Free Software Foundation,
   Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -23,20 +23,15 @@
 
 using namespace Timecode;
 
-/* This number doesn't describe the smallest division of a "beat" (which is
-   only defined contextually anyway), but rather the smallest division of the the
-   divisions of a bar. If using a meter of 4/8, there are 4 divisions per bar, and
-   we can divide each one into ticks_per_bar_division pieces; in a separate meter
-   (section) of 3/8, there are 3 divisions per bar, each of which can be divided
-   into ticks_per_bar_division pieces.
+/* This defines the smallest division of a "beat".
 
    The number is intended to have as many integer factors as possible so that
    1/Nth divisions are integer numbers of ticks.
 
-   1920 is the largest legal value that be used inside an SMF file, and has many factors.
+   1920 has many factors, though going up to 3840 gets a couple more.
 */
 
-const double BBT_Time::ticks_per_bar_division = 1920.0;
+const double BBT_Time::ticks_per_beat = 1920.0;
 
 BBT_Time::BBT_Time (double dbeats)
 {
@@ -48,6 +43,6 @@ BBT_Time::BBT_Time (double dbeats)
        assert (dbeats >= 0);
 
         bars = 0;
-        beats = rint (floor (dbeats));
-        ticks = rint (floor (BBT_Time::ticks_per_bar_division * fmod (dbeats, 1.0)));
+        beats = lrint (floor (dbeats));
+        ticks = lrint (floor (BBT_Time::ticks_per_beat * fmod (dbeats, 1.0)));
 }