summaryrefslogtreecommitdiff
path: root/libs/ardour/test
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-12-19 04:02:01 +1100
committernick_m <mainsbridge@gmail.com>2016-12-19 04:02:01 +1100
commit27b95300e2762566e766e0627e92ceb3b20f2efa (patch)
tree8fa07d2a95ff04ee11a795bcdc5c4826569cb8a6 /libs/ardour/test
parentf9743a1eb120770aadbd1981d053f6455895004f (diff)
add frame parameter for Meter ctor and TempoMap::replace_meter(). allow for various failures.
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.cc12
-rw-r--r--libs/ardour/test/framewalk_to_beats_test.cc8
-rw-r--r--libs/ardour/test/midi_clock_slave_test.h2
-rw-r--r--libs/ardour/test/tempo_test.cc30
5 files changed, 27 insertions, 27 deletions
diff --git a/libs/ardour/test/bbt_test.cc b/libs/ardour/test/bbt_test.cc
index ec5aea91ca..c9daaa753b 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), MusicTime);
+ map.add_meter (meter, 4.0, 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 ab81777840..c59578772c 100644
--- a/libs/ardour/test/framepos_plus_beats_test.cc
+++ b/libs/ardour/test/framepos_plus_beats_test.cc
@@ -21,7 +21,7 @@ FrameposPlusBeatsTest::singleTempoTest ()
Tempo tempo (bpm, 4.0);
Meter meter (4, 4);
- map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), 0, AudioTime);
map.replace_tempo (map.first_tempo(), tempo, 0.0, 0, TempoSection::Constant, AudioTime);
/* Add 1 beat to beat 3 of the first bar */
@@ -41,7 +41,7 @@ FrameposPlusBeatsTest::doubleTempoTest ()
TempoMap map (sampling_rate);
Meter meter (4, 4);
- map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -94,7 +94,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
TempoMap map (sampling_rate);
Meter meterA (4, 4);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -120,7 +120,7 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
Tempo tempoB (240, 4.0);
map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime);
Meter meterB (3, 8);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), MusicTime);
+ map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime);
/* Now some tests */
@@ -149,7 +149,7 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest ()
TempoMap map (sampling_rate);
Meter meterA (3, 4);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -177,7 +177,7 @@ FrameposPlusBeatsTest::doubleTempoWithComplexMeterTest ()
Tempo tempoB (240, 4.0);
map.add_tempo (tempoB, 12.0 / 4.0, 0, TempoSection::Constant, MusicTime);
Meter meterB (5, 8);
- map.add_meter (meterB, 9.0, BBT_Time (4, 1, 0), MusicTime);
+ map.add_meter (meterB, 9.0, BBT_Time (4, 1, 0), 0, MusicTime);
/* Now some tests */
/* Add 1 beat to 1|2 */
diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc
index 1ed044acf4..78d8c113ed 100644
--- a/libs/ardour/test/framewalk_to_beats_test.cc
+++ b/libs/ardour/test/framewalk_to_beats_test.cc
@@ -20,7 +20,7 @@ FramewalkToBeatsTest::singleTempoTest ()
Tempo tempo (bpm, 4.0);
Meter meter (4, 4);
- map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
map.replace_tempo (map.tempo_section_at_frame (0), tempo, 0.0, 0, TempoSection::Constant, AudioTime);
/* Walk 1 beats-worth of frames from beat 3 */
@@ -47,7 +47,7 @@ FramewalkToBeatsTest::doubleTempoTest ()
TempoMap map (sampling_rate);
Meter meter (4, 4);
- map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -104,7 +104,7 @@ FramewalkToBeatsTest::tripleTempoTest ()
TempoMap map (sampling_rate);
Meter meter (4, 4);
- map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 2, 160bpm at bar 3
@@ -150,7 +150,7 @@ FramewalkToBeatsTest::singleTempoMeterTest ()
Tempo tempo (bpm, 4.0);
Meter meter (7, 8);
- map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.meter_section_at_frame (0), meter, BBT_Time (1, 1, 0), 0, AudioTime);
map.replace_tempo (map.tempo_section_at_frame (0), tempo, 0.0, 0, TempoSection::Constant, AudioTime);
/* Walk 1 qn beats-worth of frames from beat 3 */
diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h
index 48365e39df..2a674aed10 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, TempoSection::Constant, AudioTime);
- _tempo_map->add_meter (meter, 0.0, Timecode::BBT_Time(1, 1, 0), AudioTime);
+ _tempo_map->add_meter (meter, 0.0, 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 6661074ba4..52d7d4ea1f 100644
--- a/libs/ardour/test/tempo_test.cc
+++ b/libs/ardour/test/tempo_test.cc
@@ -14,7 +14,7 @@ TempoTest::recomputeMapTest48 ()
TempoMap map (sampling_rate);
Meter meterA (4, 4);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -40,7 +40,7 @@ TempoTest::recomputeMapTest48 ()
Tempo tempoB (240.0, 4.0);
map.add_tempo (tempoB, 3.0, 0, TempoSection::Constant, MusicTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), MusicTime);
+ map.add_meter (meterB, 12.0, 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 ());
@@ -112,7 +112,7 @@ TempoTest::recomputeMapTest44 ()
TempoMap map (sampling_rate);
Meter meterA (4, 4);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -138,7 +138,7 @@ TempoTest::recomputeMapTest44 ()
Tempo tempoB (240.0, 4.0);
map.add_tempo (tempoB, 3.0, 0, TempoSection::Constant, MusicTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), MusicTime);
+ map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 288e3, MusicTime);
list<MetricSection*>::iterator i = map._metrics.begin();
CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -212,7 +212,7 @@ TempoTest::qnDistanceTestConstant ()
TempoMap map (sampling_rate);
Meter meterA (4, 4);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -251,7 +251,7 @@ TempoTest::qnDistanceTestConstant ()
map.add_tempo (tempoG, 0.0, (framepos_t) 2 * 60 * sampling_rate, TempoSection::Constant, AudioTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), MusicTime);
+ map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 288e3, MusicTime);
list<MetricSection*>::iterator i = map._metrics.begin();
CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
@@ -292,7 +292,7 @@ TempoTest::qnDistanceTestRamp ()
TempoMap map (sampling_rate);
Meter meterA (4, 4);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
@@ -306,10 +306,10 @@ TempoTest::qnDistanceTestRamp ()
120bpm 240bpm
0 beats 12 beats
- 0 frames 288e3 frames
+ 0 frames 288e3 frames
0 pulses 3 pulses
- | | | | |
- | 1.1 1.2 1.3 1.4 | 2.1 2.2 2.3.2.4 | 3.1 3.2 3.3 3.4 | 4.1 4.2 4.3 |
+ | | | | | |
+ | 1.1 1.2 1.3 1.4 | -no music- | 2.1 2.2 2.3.2.4 | 3.1 3.2 3.3 3.4 | 4.1 4.2 4.3 |
*/
@@ -329,7 +329,7 @@ TempoTest::qnDistanceTestRamp ()
Tempo tempoG (111.8, 4.0);
map.add_tempo (tempoG, 0.0, (framepos_t) 2 * 60 * sampling_rate, TempoSection::Ramp, AudioTime);
Meter meterB (3, 4);
- map.add_meter (meterB, 4.0, BBT_Time (2, 1, 0), AudioTime);
+ map.add_meter (meterB, 4.0, BBT_Time (2, 1, 0), 288e3, AudioTime);
map.recompute_map (map._metrics, 1);
list<MetricSection*>::iterator i = map._metrics.begin();
@@ -371,7 +371,7 @@ TempoTest::rampTest48 ()
Tempo tempoB (217.0, 4.0);
map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Ramp, AudioTime);
map.add_tempo (tempoB, 0.0, (framepos_t) 60 * sampling_rate, TempoSection::Ramp, AudioTime);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
@@ -433,7 +433,7 @@ TempoTest::rampTest44 ()
Tempo tempoB (217.0, 4.0);
map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Ramp, AudioTime);
map.add_tempo (tempoB, 0.0, (framepos_t) 60 * sampling_rate, TempoSection::Ramp, AudioTime);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
/*
@@ -495,7 +495,7 @@ TempoTest::tempoAtPulseTest ()
Tempo tempoB (160.0, 3.0);
Tempo tempoC (123.0, 4.0);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Ramp, AudioTime);
map.add_tempo (tempoB, 20.0, 0, TempoSection::Ramp, MusicTime);
@@ -568,7 +568,7 @@ TempoTest::tempoFundamentalsTest ()
Tempo tempoD (160.0, 2.0);
Tempo tempoE (123.0, 3.0);
- map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), AudioTime);
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), 0, AudioTime);
map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
map.add_tempo (tempoB, 20.0, 0, TempoSection::Constant, MusicTime);