int const bpm = 120;
double const frames_per_beat = (60 / double (bpm)) * double (sampling_rate);
-
+
TempoMap map (sampling_rate);
Tempo tempo (bpm);
Meter meter (4, 4);
- map.add_meter (meter, BBT_Time (1, 1, 0));
- map.add_tempo (tempo, BBT_Time (1, 1, 0));
+ map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), (framepos_t) 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 */
- framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, 1);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (frames_per_beat * 3));
+ framepos_t r = map.framepos_plus_beats (frames_per_beat * 2, Evoral::Beats(1));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (frames_per_beat * 3), r);
/* Add 4 beats to a -ve frame of 1 beat before zero */
- r = map.framepos_plus_beats (-frames_per_beat * 1, 4);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (frames_per_beat * 3));
+ r = map.framepos_plus_beats (-frames_per_beat * 1, Evoral::Beats(4));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (frames_per_beat * 3), r);
}
/* Test adding things that overlap a tempo change */
TempoMap map (sampling_rate);
Meter meter (4, 4);
- map.add_meter (meter, BBT_Time (1, 1, 0));
+ map.replace_meter (map.first_meter(), meter, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
-
+
120bpm = 24e3 samples per beat
240bpm = 12e3 samples per beat
*/
-
+
/*
-
+
120bpm 240bpm
0 beats 12 beats
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 4.4 |
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime);
/* Now some tests */
/* Add 1 beat to 1|2 */
- framepos_t r = map.framepos_plus_beats (24e3, 1);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (48e3));
+ framepos_t r = map.framepos_plus_beats (24e3, Evoral::Beats(1));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (48e3), r);
/* Add 2 beats to 3|4 (over the tempo change) */
- r = map.framepos_plus_beats (264e3, 2);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3));
+ r = map.framepos_plus_beats (264e3, Evoral::Beats(2));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
/* Add 2.5 beats to 3|3|960 (over the tempo change) */
- r = map.framepos_plus_beats (264e3 - 12e3, 2.5);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3));
+ r = map.framepos_plus_beats (264e3 - 12e3, Evoral::Beats(2.5));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
}
/* Same as doubleTempoTest () except put a meter change at the same time as the
tempo change (which shouldn't affect anything, since we are just dealing with
beats)
*/
-
+
void
FrameposPlusBeatsTest::doubleTempoWithMeterTest ()
{
TempoMap map (sampling_rate);
Meter meterA (4, 4);
- map.add_meter (meterA, BBT_Time (1, 1, 0));
+ map.replace_meter (map.first_meter(), meterA, BBT_Time (1, 1, 0), (framepos_t) 0, AudioTime);
/*
120bpm at bar 1, 240bpm at bar 4
-
+
120bpm = 24e3 samples per beat
240bpm = 12e3 samples per beat
*/
-
+
/*
-
+
120bpm 240bpm
0 beats 12 beats
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 |
*/
Tempo tempoA (120);
- map.add_tempo (tempoA, BBT_Time (1, 1, 0));
+ map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
Tempo tempoB (240);
- map.add_tempo (tempoB, BBT_Time (4, 1, 0));
+ map.add_tempo (tempoB, 12.0 / tempoA.note_type(), 0, TempoSection::Constant, MusicTime);
Meter meterB (3, 4);
- map.add_meter (meterB, BBT_Time (4, 1, 0));
+ map.add_meter (meterB, 12.0, BBT_Time (4, 1, 0), 0, MusicTime);
/* Now some tests */
/* Add 1 beat to 1|2 */
- framepos_t r = map.framepos_plus_beats (24e3, 1);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (48e3));
+ framepos_t r = map.framepos_plus_beats (24e3, Evoral::Beats(1));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (48e3), r);
/* Add 2 beats to 3|4 (over the tempo change) */
- r = map.framepos_plus_beats (264e3, 2);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3));
+ r = map.framepos_plus_beats (264e3, Evoral::Beats(2));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
/* Add 2.5 beats to 3|3|960 (over the tempo change) */
- r = map.framepos_plus_beats (264e3 - 12e3, 2.5);
- CPPUNIT_ASSERT_EQUAL (r, framepos_t (264e3 + 24e3 + 12e3));
+ r = map.framepos_plus_beats (264e3 - 12e3, Evoral::Beats(2.5));
+ CPPUNIT_ASSERT_EQUAL (framepos_t (264e3 + 24e3 + 12e3), r);
}