diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-19 19:44:43 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-19 19:44:43 +0000 |
commit | e9b4f14668a54e32e83005f0b09889372d1abe11 (patch) | |
tree | 1ce665f1cca65433ecafd9909908ecb7366e742b /libs/timecode | |
parent | ca9a444aa9a7e4c26aea2d31dedee3cbbc33ae78 (diff) |
rename Timecode::BBT_Time::ticks_per_beat to Timecode::BBT_Time::ticks_per_bar_division which is a more accurate and informative name. The 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.
git-svn-id: svn://localhost/ardour2/branches/3.0@11022 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/timecode')
-rw-r--r-- | libs/timecode/src/bbt_time.cc | 17 | ||||
-rw-r--r-- | libs/timecode/timecode/bbt_time.h | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/libs/timecode/src/bbt_time.cc b/libs/timecode/src/bbt_time.cc index c48191abe8..6de822524d 100644 --- a/libs/timecode/src/bbt_time.cc +++ b/libs/timecode/src/bbt_time.cc @@ -23,7 +23,20 @@ using namespace Timecode; -const double BBT_Time::ticks_per_beat = 1920.0; +/* 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. + + 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. +*/ + +const double BBT_Time::ticks_per_bar_division = 1920.0; BBT_Time::BBT_Time (double dbeats) { @@ -36,5 +49,5 @@ BBT_Time::BBT_Time (double dbeats) bars = 0; beats = rint (floor (dbeats)); - ticks = rint (floor (BBT_Time::ticks_per_beat * fmod (dbeats, 1.0))); + ticks = rint (floor (BBT_Time::ticks_per_bar_division * fmod (dbeats, 1.0))); } diff --git a/libs/timecode/timecode/bbt_time.h b/libs/timecode/timecode/bbt_time.h index 226a2fc894..46307dbc04 100644 --- a/libs/timecode/timecode/bbt_time.h +++ b/libs/timecode/timecode/bbt_time.h @@ -27,7 +27,7 @@ namespace Timecode { /** Bar, Beat, Tick Time (i.e. Tempo-Based Time) */ struct BBT_Time { - static const double ticks_per_beat; + static const double ticks_per_bar_division; uint32_t bars; uint32_t beats; |