ardour/livetrax
13
0
Fork 0
Code

fix lock error in empoMap::quarter_note_at_bbt_rt(), expand constant tempo test.

Browse Source
This commit is contained in:
nick_m 2016-11-04 02:17:59 +11:00
parent 93ca7b42fb
commit 5788f42438
2 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libs/ardour/tempo.cc
View File

@ -1975,10 +1975,18 @@ TempoMap::bbt_at_beat_locked (const Metrics& metrics, const double& b) const
* while the input uses meter, the output does not.
*/
double
TempoMap::quarter_note_at_bbt_rt (const Timecode::BBT_Time& bbt)
TempoMap::quarter_note_at_bbt (const Timecode::BBT_Time& bbt)
{
Glib::Threads::RWLock::ReaderLock lm (lock);
return pulse_at_bbt_locked (_metrics, bbt) * 4.0;
}
double
TempoMap::quarter_note_at_bbt_rt (const Timecode::BBT_Time& bbt)
{
Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK);
if (!lm.locked()) {
throw std::logic_error ("TempoMap::quarter_note_at_bbt_rt() could not lock tempo map");
}
@ -2017,6 +2025,21 @@ TempoMap::pulse_at_bbt_locked (const Metrics& metrics, const Timecode::BBT_Time&
return ret;
}
/** Returns the BBT time corresponding to the supplied quarter-note beat.
* @param qn the quarter-note beat.
* @return The BBT time (meter-based) at the supplied meter-based beat.
*
* quarter-notes ignore meter and are based on pulse (the musical unit of MetricSection).
*
*/
Timecode::BBT_Time
TempoMap::bbt_at_quarter_note (const double& qn)
{
Glib::Threads::RWLock::ReaderLock lm (lock);
return bbt_at_pulse_locked (_metrics, qn / 4.0);
}
/** Returns the BBT time (meter-based) corresponding to the supplied whole-note pulse position.
* @param metrics The list of metric sections used to determine the result.
* @param pulse The whole-note pulse.

40
libs/ardour/test/tempo_test.cc
View File

@ -235,17 +235,21 @@ TempoTest::qnDistanceTestConstant ()
Tempo tempoA (120.0);
map.replace_tempo (map.first_tempo(), tempoA, 0.0, 0, TempoSection::Constant, AudioTime);
Tempo tempoB (240.0);
map.add_tempo (tempoB, 3.0, 0, TempoSection::Constant, MusicTime);
Tempo tempoC (130.3);
map.add_tempo (tempoC, 6.0, 0, TempoSection::Constant, MusicTime);
/* should have no effect on pulse */
Tempo tempoB (120.0);
map.add_tempo (tempoB, 2.0, 0, TempoSection::Constant, MusicTime);
/* equivalent to pulse 3.0 @ 120 bpm*/
Tempo tempoC (240.0);
map.add_tempo (tempoC, 0.0, 6 * sampling_rate, TempoSection::Constant, AudioTime);
Tempo tempoD (90.4);
map.add_tempo (tempoD, 9.0, 0, TempoSection::Constant, MusicTime);
Tempo tempoE (110.6);
map.add_tempo (tempoE, 12.0, 0, TempoSection::Constant, MusicTime);
Tempo tempoF (123.7);
map.add_tempo (tempoF, 15.0, 0, TempoSection::Constant, MusicTime);
Tempo tempoG (111.8);
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);
@ -253,13 +257,33 @@ TempoTest::qnDistanceTestConstant ()
CPPUNIT_ASSERT_EQUAL (framepos_t (0), (*i)->frame ());
i = map._metrics.end();
--i;
CPPUNIT_ASSERT_EQUAL ((*i)->frame(), map.frames_between_quarter_notes (0.0, 60.0));
CPPUNIT_ASSERT_EQUAL ((*i)->frame(), map.frames_between_quarter_notes (0.0, (*i)->pulse() * 4.0));
--i;
/* tempoF */
CPPUNIT_ASSERT_EQUAL ((*i)->frame(), map.frames_between_quarter_notes (0.0, 15.0 * 4.0));
CPPUNIT_ASSERT_DOUBLES_EQUAL ((*i)->minute(), map.minutes_between_quarter_notes_locked (map._metrics, 0.0, 15.0 * 4.0), 1e-17);
--i;
/* tempoE */
CPPUNIT_ASSERT_EQUAL ((*i)->frame(), map.frames_between_quarter_notes (0.0, 12.0 * 4.0));
CPPUNIT_ASSERT_DOUBLES_EQUAL ((*i)->minute(), map.minutes_between_quarter_notes_locked (map._metrics, 0.0, 12.0 * 4.0), 1e-17);
--i;
CPPUNIT_ASSERT_EQUAL ((*i)->frame(), map.frames_between_quarter_notes (0.0, 9.0 * 4.0));
CPPUNIT_ASSERT_DOUBLES_EQUAL ((*i)->minute(), map.minutes_between_quarter_notes_locked (map._metrics, 0.0, 9.0 * 4.0), 1e-17);
--i;
/* tempoC */
CPPUNIT_ASSERT_EQUAL (framecnt_t (6 * sampling_rate), map.frames_between_quarter_notes (0.0, (*i)->pulse() * 4.0));
CPPUNIT_ASSERT_DOUBLES_EQUAL (0.1, map.minutes_between_quarter_notes_locked (map._metrics, 0.0, (*i)->pulse() * 4.0), 1e-17);
/* distance from beat 12.0 to 0.0 should be 6.0 seconds */
CPPUNIT_ASSERT_EQUAL (framecnt_t (264600), map.frames_between_quarter_notes (0.0, 12.0));
CPPUNIT_ASSERT_EQUAL (framecnt_t (264600), map.frames_between_quarter_notes (0.0, 3.0 * 4.0));
CPPUNIT_ASSERT_EQUAL (framecnt_t (-264600), map.frames_between_quarter_notes (3.0 * 4.0, 0.0));
CPPUNIT_ASSERT_EQUAL (framecnt_t (396900), map.frames_between_quarter_notes (0.0, 24.0));
CPPUNIT_ASSERT_EQUAL (framecnt_t (-264600), map.frames_between_quarter_notes (12.0, 0.0));
CPPUNIT_ASSERT_EQUAL (framecnt_t (-396900), map.frames_between_quarter_notes (24.0, 0.0));
CPPUNIT_ASSERT_EQUAL (framecnt_t (88200), map.frames_between_quarter_notes (2.0 * 4.0, 3.0 * 4.0));
}
void
TempoTest::qnDistanceTestRamp ()