smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 06:05:43 +01:00
Code Issues Projects Releases Wiki Activity

Tempo ramps - set correct beat on audio locked meters.

Browse source
This commit is contained in:
nick_m 2016-04-01 00:32:52 +11:00
parent 094aa816df
commit dd212ea4af
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libs/ardour/tempo.cc
View file

@ -1263,7 +1263,7 @@ TempoMap::recompute_meters (Metrics& metrics)
pair<double, BBT_Time> b_bbt;
if (meter->movable()) {
double beats = ((pulse_at_frame_locked (metrics, meter->frame()) - prev_m->pulse()) * prev_m->note_divisor()) - prev_m->beat();
double ceil_beats = beats + prev_m->divisions_per_bar() - fmod (beats, prev_m->divisions_per_bar());
double ceil_beats = beats - fmod (beats, prev_m->divisions_per_bar());
const double true_pulse = prev_m->pulse() + (ceil_beats - prev_m->beat()) / prev_m->note_divisor();
const double pulse_off = true_pulse - ((beats - prev_m->beat()) / prev_m->note_divisor());
b_bbt = make_pair (ceil_beats, BBT_Time (accumulated_bars + 1, 1, 0));
@ -2022,7 +2022,7 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const Meter& mt,
pair<double, BBT_Time> b_bbt;
if (m->movable()) {
double beats = ((pulse_at_frame_locked (imaginary, frame) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat();
double ceil_beats = beats + prev_ms->divisions_per_bar() - fmod (beats, prev_ms->divisions_per_bar());
double ceil_beats = beats - fmod (beats, prev_ms->divisions_per_bar());
b_bbt = make_pair (ceil_beats, BBT_Time (accumulated_bars + 1, 1, 0));
const double true_pulse = prev_ms->pulse() + ((ceil (beats) - prev_ms->beat()) / prev_ms->note_divisor());
const double pulse_off = true_pulse - ((beats - prev_ms->beat()) / prev_ms->note_divisor());
@ -2045,7 +2045,7 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const Meter& mt,
pair<double, BBT_Time> b_bbt;
if (m->movable()) {
double beats = ((pulse_at_frame_locked (imaginary, m->frame()) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat();
double ceil_beats = beats + prev_ms->divisions_per_bar() - fmod (beats , prev_ms->divisions_per_bar());
double ceil_beats = beats - fmod (beats , prev_ms->divisions_per_bar());
const double true_pulse = prev_ms->pulse() + (m->beat() - prev_ms->beat()) / prev_ms->note_divisor();
const double pulse_off = true_pulse - ((ceil_beats - prev_ms->beat()) / prev_ms->note_divisor());
b_bbt = make_pair (ceil_beats, BBT_Time (accumulated_bars + 1, 1, 0));
@ -2107,14 +2107,13 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const Meter& mt,
pair<double, BBT_Time> b_bbt;
if (m->movable()) {
double beats = ((pulse_at_frame_locked (imaginary, m->frame()) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat();
double ceil_beats = beats + prev_ms->divisions_per_bar() - fmod (beats , prev_ms->divisions_per_bar());
double ceil_beats = beats - fmod (beats , prev_ms->divisions_per_bar());
const double true_pulse = prev_ms->pulse() + (m->beat() - prev_ms->beat()) / prev_ms->note_divisor();
const double pulse_off = true_pulse - ((ceil_beats - prev_ms->beat()) / prev_ms->note_divisor());
b_bbt = make_pair (ceil_beats, BBT_Time (accumulated_bars + 1, 1, 0));
pulse = true_pulse - pulse_off;
} else {
b_bbt = make_pair (0.0, BBT_Time (1, 1, 0));
pulse = 0.0;
}
m->set_beat (b_bbt);
m->set_pulse (pulse);