summaryrefslogtreecommitdiff
path: root/libs/ardour/test
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2015-12-21 07:11:20 +1100
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:09 +1000
commit2d649ceac1633b3ea7d770a13944c7b6a1161e9b (patch)
tree52dfd5b41052ff96f638204955f7dd85e39a2554 /libs/ardour/test
parentaf07762f98aac7a856326dbcdbc69ae2517c2a96 (diff)
Tempo ramps - get tests to comile again.
Diffstat (limited to 'libs/ardour/test')
-rw-r--r--libs/ardour/test/framepos_minus_beats_test.cc10
-rw-r--r--libs/ardour/test/framepos_plus_beats_test.cc10
-rw-r--r--libs/ardour/test/framewalk_to_beats_test.cc12
-rw-r--r--libs/ardour/test/midi_clock_slave_test.h2
-rw-r--r--libs/ardour/test/tempo_test.cc4
5 files changed, 19 insertions, 19 deletions
diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc
index 12f020e2d7..7b6941e507 100644
--- a/libs/ardour/test/framepos_minus_beats_test.cc
+++ b/libs/ardour/test/framepos_minus_beats_test.cc
@@ -23,7 +23,7 @@ FrameposMinusBeatsTest::singleTempoTest ()
Meter meter (4, 4);
map.add_meter (meter, BBT_Time (1, 1, 0));
- map.add_tempo (tempo, BBT_Time (1, 1, 0));
+ map.add_tempo (tempo, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
/* Subtract 1 beat from beat 3 of the first bar */
framepos_t r = map.framepos_minus_beats (frames_per_beat * 2, Beats(1));
@@ -63,9 +63,9 @@ FrameposMinusBeatsTest::doubleTempoTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::TempoSectionType::Constant);
/* Now some tests */
@@ -115,9 +115,9 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::TempoSectionType::Constant);
Meter meterB (3, 4);
map.add_meter (meterB, BBT_Time (4, 1, 0));
diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc
index 69fd9a597d..442c9b3d56 100644
--- a/libs/ardour/test/framepos_plus_beats_test.cc
+++ b/libs/ardour/test/framepos_plus_beats_test.cc
@@ -22,7 +22,7 @@ FrameposPlusBeatsTest::singleTempoTest ()
Meter meter (4, 4);
map.add_meter (meter, BBT_Time (1, 1, 0));
- map.add_tempo (tempo, BBT_Time (1, 1, 0));
+ map.add_tempo (tempo, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
/* Add 1 beat to beat 3 of the first bar */
framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, Evoral::Beats(1));
@@ -62,9 +62,9 @@ FrameposPlusBeatsTest::doubleTempoTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::TempoSectionType::Constant);
/* Now some tests */
@@ -114,9 +114,9 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::TempoSectionType::Constant);
Meter meterB (3, 4);
map.add_meter (meterB, BBT_Time (4, 1, 0));
diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc
index 8b7748cfa4..67a9be72c4 100644
--- a/libs/ardour/test/framewalk_to_beats_test.cc
+++ b/libs/ardour/test/framewalk_to_beats_test.cc
@@ -21,7 +21,7 @@ FramewalkToBeatsTest::singleTempoTest ()
Meter meter (4, 4);
map.add_meter (meter, BBT_Time (1, 1, 0));
- map.add_tempo (tempo, BBT_Time (1, 1, 0));
+ map.add_tempo (tempo, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
/* Walk 1 beats-worth of frames from beat 3 */
double r = map.framewalk_to_beats (frames_per_beat * 2, frames_per_beat * 1).to_double();
@@ -70,9 +70,9 @@ FramewalkToBeatsTest::doubleTempoTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::TempoSectionType::Constant);
/* Now some tests */
@@ -125,11 +125,11 @@ FramewalkToBeatsTest::tripleTempoTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (2, 1, 0));
+ map.add_tempo (tempoB, BBT_Time (2, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoC (160);
- map.add_tempo (tempoC, BBT_Time (3, 1, 0));
+ map.add_tempo (tempoC, BBT_Time (3, 1, 0), TempoSection::TempoSectionType::Constant);
/* Walk from 1|3 to 4|1 */
double r = map.framewalk_to_beats (2 * 24e3, (2 * 24e3) + (4 * 12e3) + (4 * 18e3)).to_double();
diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h
index 0899eed6ce..d5d7a86153 100644
--- a/libs/ardour/test/midi_clock_slave_test.h
+++ b/libs/ardour/test/midi_clock_slave_test.h
@@ -48,7 +48,7 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy {
meter (4.0, 4.0)
{
_tempo_map = new TempoMap (FRAME_RATE);
- _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0));
+ _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0), TempoSection::TempoSectionType::Constant);
_tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0));
}
diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc
index 4905259351..21bd8eb627 100644
--- a/libs/ardour/test/tempo_test.cc
+++ b/libs/ardour/test/tempo_test.cc
@@ -35,9 +35,9 @@ TempoTest::recomputeMapTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.add_tempo (tempoA, BBT_Time (1, 1, 0), TempoSection::TempoSectionType::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, BBT_Time (4, 1, 0), TempoSection::TempoSectionType::Constant);
Meter meterB (3, 4);
map.add_meter (meterB, BBT_Time (4, 1, 0));