summaryrefslogtreecommitdiff
path: root/libs/ardour/test
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2017-07-18 02:48:04 +1000
committernick_m <mainsbridge@gmail.com>2017-07-22 02:15:20 +1000
commit1399ef391de5b05888ea2e13e6ff80f14b6e84d9 (patch)
treeb9930edcee2fcfd0f427c6e58db67e41915913df /libs/ardour/test
parentc03da364ad31dc31e90f954e6d8f7e38a59bdcfd (diff)
Remove redundant beat arg from TempoMap::add_meter
BBT time should be enough to determine the beat.
Diffstat (limited to 'libs/ardour/test')
-rw-r--r--libs/ardour/test/bbt_test.cc2
-rw-r--r--libs/ardour/test/framepos_plus_beats_test.cc4
-rw-r--r--libs/ardour/test/midi_clock_slave_test.h2
-rw-r--r--libs/ardour/test/tempo_test.cc8
4 files changed, 8 insertions, 8 deletions
diff --git a/libs/ardour/test/bbt_test.cc b/libs/ardour/test/bbt_test.cc
index c9daaa753b..f1a8934905 100644
--- a/libs/ardour/test/bbt_test.cc
+++ b/libs/ardour/test/bbt_test.cc
@@ -17,7 +17,7 @@ BBTTest::addTest ()
Meter meter(4.0, 4.0);
/* no need to supply the frame for a new music-locked meter */
- map.add_meter (meter, 4.0, BBT_Time(2, 1, 0), 0, MusicTime);
+ map.add_meter (meter, BBT_Time(2, 1, 0), 0, MusicTime);
/* add some good stuff here */
}
diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc
index cb5211b007..d52717bb60 100644
--- a/libs/ardour/test/framepos_plus_beats_test.cc
+++ b/libs/ardour/test/framepos_plus_beats_test.cc
@@ -120,7 +120,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
Tempo tempoB (240, 4.0);
map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, MusicTime);
Meter meterB (3, 8);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime);
+ map.add_meter (meterB, BBT_Time (4, 1, 0), 0, MusicTime);
/* Now some tests */
@@ -177,7 +177,7 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest ()
Tempo tempoB (240, 4.0);
map.add_tempo (tempoB, 12.0 / 4.0, 0, MusicTime);
Meter meterB (5, 8);
- map.add_meter (meterB, 9.0, BBT_Time (4, 1, 0), 0, MusicTime);
+ map.add_meter (meterB, BBT_Time (4, 1, 0), 0, MusicTime);
/* Now some tests */
/* Add 1 beat to 1|2 */
diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h
index 3423fede13..0996c6360d 100644
--- a/libs/ardour/test/midi_clock_slave_test.h
+++ b/libs/ardour/test/midi_clock_slave_test.h
@@ -49,7 +49,7 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy {
{
_tempo_map = new TempoMap (FRAME_RATE);
_tempo_map->add_tempo (tempo, 0.0, 0, AudioTime);
- _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0), 0, AudioTime);
+ _tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0), 0, AudioTime);
}
// Controlling the mock object
diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc
index 6ef9e88990..c3ca93f86a 100644
--- a/libs/ardour/test/tempo_test.cc
+++ b/libs/ardour/test/tempo_test.cc
@@ -40,7 +40,7 @@ TempoTest::recomputeMapTest48 ()
Tempo tempoB (240.0, 4.0);
map.add_tempo (tempoB, 3.0, 0, MusicTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime);
+ map.add_meter (meterB, BBT_Time (4, 1, 0), 0, MusicTime);
//map.dump (map._metrics, std::cout);
list<MetricSection*>::iterator i = map._metrics.begin();
CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -138,7 +138,7 @@ TempoTest::recomputeMapTest44 ()
Tempo tempoB (240.0, 4.0);
map.add_tempo (tempoB, 3.0, 0, MusicTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 288e3, MusicTime);
+ map.add_meter (meterB, BBT_Time (4, 1, 0), 288e3, MusicTime);
list<MetricSection*>::iterator i = map._metrics.begin();
CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -251,7 +251,7 @@ TempoTest::qnDistanceTestConstant ()
map.add_tempo (tempoG, 0.0, (framepos_t) 2 * 60 * sampling_rate, AudioTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 288e3, MusicTime);
+ map.add_meter (meterB, BBT_Time (4, 1, 0), 288e3, MusicTime);
list<MetricSection*>::iterator i = map._metrics.begin();
CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -329,7 +329,7 @@ TempoTest::qnDistanceTestRamp ()
Tempo tempoG (111.8, 4.0);
map.add_tempo (tempoG, 0.0, (framepos_t) 2 * 60 * sampling_rate, AudioTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 4.0, BBT_Time (2, 1, 0), 288e3, AudioTime);
+ map.add_meter (meterB, BBT_Time (2, 1, 0), 288e3, AudioTime);
map.recompute_map (map._metrics, 1);
list<MetricSection*>::iterator i = map._metrics.begin();