smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

Tempo ramps - allow moving the first meter if audio locked.

Browse source 
- strangely broken wrt the grid, but kind-of works.
This commit is contained in:
nick_m 2016-03-20 01:03:10 +11:00
parent 17a6cda89a
commit f16089ba88
2 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/editor_tempodisplay.cc
View file

@ -116,7 +116,6 @@ Editor::tempo_map_changed (const PropertyChange& /*ignored*/)
} }
std::vector<TempoMap::BBTPoint> grid; std::vector<TempoMap::BBTPoint> grid;
compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples()); compute_current_bbt_points (grid, leftmost_frame, leftmost_frame + current_page_samples());
_session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers _session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
draw_measures (grid); draw_measures (grid);
@ -185,12 +184,9 @@ Editor::compute_current_bbt_points (std::vector<TempoMap::BBTPoint>& grid, frame
return; return;
} }
framecnt_t beat_before_lower_pos = _session->tempo_map().frame_at_beat (floor(_session->tempo_map().beat_at_frame (leftmost)));
framecnt_t beat_after_upper_pos = _session->tempo_map().frame_at_beat (floor (_session->tempo_map().beat_at_frame (rightmost)) + 1.0);
/* prevent negative values of leftmost from creeping into tempomap /* prevent negative values of leftmost from creeping into tempomap
*/ */
_session->tempo_map().get_grid (grid, max (beat_before_lower_pos, (framepos_t) 0), beat_after_upper_pos); _session->tempo_map().get_grid (grid, max (leftmost, (framepos_t) 0), rightmost);
} }
void void

6
libs/ardour/tempo.cc
View file

@ -1454,10 +1454,10 @@ TempoMap::beat_at_pulse (const Metrics& metrics, const double& pulse) const
for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
MeterSection* m; MeterSection* m;
if ((m = dynamic_cast<MeterSection*> (*i)) != 0) { if ((m = dynamic_cast<MeterSection*> (*i)) != 0) {
if (m->pulse() > pulse) {
break;
}
if (prev_ms) { if (prev_ms) {
if (m->pulse() > pulse) {
break;
}
accumulated_beats += (m->pulse() - prev_ms->pulse()) * prev_ms->note_divisor(); accumulated_beats += (m->pulse() - prev_ms->pulse()) * prev_ms->note_divisor();
} }
prev_ms = m; prev_ms = m;