summaryrefslogtreecommitdiff
path: root/libs/ardour/test
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-02-13 04:16:06 +1100
committernick_m <mainsbridge@gmail.com>2016-05-27 23:38:10 +1000
commit36f04367dff567a24f94b8686b0625d9b51210ef (patch)
tree3f523deca14b2e9d9209d8810c4b81cd1904c631 /libs/ardour/test
parentbdef9b2466a3658a564d65ab0be4c7471159a104 (diff)
Tempo ramps - fix crazy compilable namespace thinko
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/tempo_test.cc4
4 files changed, 18 insertions, 18 deletions
diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc
index 588a38c097..fd06f7de84 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, 0.0, BBT_Time (1, 1, 0));
- map.add_tempo (tempo, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempo, 0.0, TempoSection::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, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoB, 12.0, TempoSection::Constant);
/* Now some tests */
@@ -115,9 +115,9 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoB, 12.0, TempoSection::Constant);
Meter meterB (3, 4);
map.add_meter (meterB, 12.0, 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 ab52861f50..a2cc616c58 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, 0.0, BBT_Time (1, 1, 0));
- map.add_tempo (tempo, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempo, 0.0, TempoSection::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, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoB, 12.0, TempoSection::Constant);
/* Now some tests */
@@ -114,9 +114,9 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoB, 12.0, TempoSection::Constant);
Meter meterB (3, 4);
map.add_meter (meterB, 12.0, 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 f6e84ddfad..9706375216 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, 0.0, BBT_Time (1, 1, 0));
- map.add_tempo (tempo, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempo, 0.0, TempoSection::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, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoB, 12.0, TempoSection::Constant);
/* Now some tests */
@@ -125,11 +125,11 @@ FramewalkToBeatsTest::tripleTempoTest ()
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 4.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoB, 4.0, TempoSection::Constant);
Tempo tempoC (160);
- map.add_tempo (tempoC, 8.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoC, 8.0, TempoSection::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/tempo_test.cc b/libs/ardour/test/tempo_test.cc
index a7f9c1d405..638e110761 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, 0.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoA, 0.0, TempoSection::Constant);
Tempo tempoB (240);
- map.add_tempo (tempoB, 12.0, TempoSection::Type::Constant);
+ map.add_tempo (tempoB, 12.0, TempoSection::Constant);
Meter meterB (3, 4);
map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0));