Add bbt_add that does not take Metric parameter.

git-svn-id: svn://localhost/ardour2/branches/3.0@5955 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h
index d3c3a6340b2ce08a1699dd538c13f33acd7ab1c9..99dfffa81fcd7f4b587291a6bc97afcd6f925297 100644 (file)
--- 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 094c507dea0210424e249b6e91c50335eae49860..d7300f937b9f4b592aa1299a52bd082c8334c8db 100644 (file)
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -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);
 }
 
+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)
 {