Add bbt_add that does not take Metric parameter.
git-svn-id: svn://localhost/ardour2/branches/3.0@5955 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
5ec7afb734
commit
fe910cdc13
@ -254,6 +254,7 @@ class TempoMap : public PBD::StatefulDestructible
|
|||||||
int n_meters () const;
|
int n_meters () const;
|
||||||
|
|
||||||
BBT_Time bbt_add (const BBT_Time& a, const BBT_Time& b, const TempoMetric& metric);
|
BBT_Time bbt_add (const BBT_Time& a, const BBT_Time& b, const TempoMetric& metric);
|
||||||
|
BBT_Time bbt_add (const BBT_Time& a, const BBT_Time& b);
|
||||||
BBT_Time bbt_subtract (const BBT_Time& a, const BBT_Time& b);
|
BBT_Time bbt_subtract (const BBT_Time& a, const BBT_Time& b);
|
||||||
|
|
||||||
nframes_t frame_rate () const { return _frame_rate; }
|
nframes_t frame_rate () const { return _frame_rate; }
|
||||||
|
@ -1624,6 +1624,13 @@ TempoMap::bbt_add (const BBT_Time& a, const BBT_Time& b, const TempoMetric& /*me
|
|||||||
return BBT_Time(a.bars + b.bars, a.beats + b.beats, a.ticks + b.ticks);
|
return BBT_Time(a.bars + b.bars, a.beats + b.beats, a.ticks + b.ticks);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BBT_Time
|
||||||
|
TempoMap::bbt_add (const BBT_Time& a, const BBT_Time& b)
|
||||||
|
{
|
||||||
|
// FIXME: Obviously not correct!
|
||||||
|
return BBT_Time(a.bars + b.bars, a.beats + b.beats, a.ticks + b.ticks);
|
||||||
|
}
|
||||||
|
|
||||||
BBT_Time
|
BBT_Time
|
||||||
TempoMap::bbt_subtract (const BBT_Time& a, const BBT_Time& b)
|
TempoMap::bbt_subtract (const BBT_Time& a, const BBT_Time& b)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user