summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2009-10-28 15:33:54 +0000
committerDavid Robillard <d@drobilla.net>2009-10-28 15:33:54 +0000
commitfe910cdc132c0f18d85c5aedebbbdbef58ed2ac7 (patch)
tree4c9cd5bf7720927b94caa2db95b51dc7985c9726 /libs/ardour
parent5ec7afb7348b500684be0f6806256e3719210ec4 (diff)
Add bbt_add that does not take Metric parameter.
git-svn-id: svn://localhost/ardour2/branches/3.0@5955 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/ardour/tempo.h1
-rw-r--r--libs/ardour/tempo.cc7
2 files changed, 8 insertions, 0 deletions
diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index d3c3a6340b..99dfffa81f 100644
--- a/libs/ardour/ardour/tempo.h
+++ b/libs/ardour/ardour/tempo.h
@@ -254,6 +254,7 @@ class TempoMap : public PBD::StatefulDestructible
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);
BBT_Time bbt_subtract (const BBT_Time& a, const BBT_Time& b);
nframes_t frame_rate () const { return _frame_rate; }
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 094c507dea..d7300f937b 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1625,6 +1625,13 @@ TempoMap::bbt_add (const BBT_Time& a, const BBT_Time& b, const TempoMetric& /*me
}
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
TempoMap::bbt_subtract (const BBT_Time& a, const BBT_Time& b)
{
// FIXME: Obviously not correct!