allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

move ticks per beat from Meter to Timecode::BBT_Time, add new constructor for BBT_Time based on a double value; reduce BeatFramesConverted to 1 liners pending likely removal

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8277 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2010-12-14 20:28:37 +00:00
parent ee5a37a306
commit f09524b9d3
13 changed files with 86 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libs/timecode/src/bbt_time.cc Normal file
View File

@@ -0,0 +1,37 @@
/*
Copyright (C) 2002-2010 Paul Davis
This program is free software; you can redistribute it and/or modify it
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.
*/
#include <cmath>
#include "timecode/bbt_time.h"
using namespace Timecode;
const double BBT_Time::ticks_per_beat = 1920.0;
BBT_Time::BBT_Time (double beats)
{
/* NOTE: this does not construct a BBT time in a canonical form,
in that beats may be a very large number, and bars will
always be zero.
*/
bars = 0;
beats = rint (floor (beats));
ticks = rint (floor (BBT_Time::ticks_per_beat * fmod (beats, 1.0)));
}

4
libs/timecode/timecode/bbt_time.h
View File

@@ -27,6 +27,8 @@ namespace Timecode {
/** Bar, Beat, Tick Time (i.e. Tempo-Based Time) */
struct BBT_Time {
static const double ticks_per_beat;
uint32_t bars;
uint32_t beats;
uint32_t ticks;
@@ -36,6 +38,8 @@ struct BBT_Time {
BBT_Time (uint32_t ba, uint32_t be, uint32_t t)
: bars (ba), beats (be), ticks (t) {}
BBT_Time (double beats);
bool operator< (const BBT_Time& other) const {
return bars < other.bars ||

2
libs/timecode/wscript
View File

@@ -33,7 +33,7 @@ def configure(conf):
def build(bld):
# Library
obj = bld.new_task_gen('cxx', 'shlib')
obj.source = 'src/time.cc'
obj.source = [ 'src/time.cc', 'src/bbt_time.cc' ]
obj.export_incdirs = ['.']
obj.includes = ['.', './src']
obj.name = 'libtimecode'