ardour/livetrax
13
0
Fork 0
Code

Tempo ramps - rulers don't request negative bbt.

Browse Source 
- i'm reluctant to fix this at the map level.
This commit is contained in:
nick_m 2016-04-05 03:38:30 +10:00
parent 7d66ae59d3
commit 72812d2cd0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/editor_rulers.cc
View File

@ -1017,8 +1017,14 @@ Editor::compute_bbt_ruler_scale (std::vector<ARDOUR::TempoMap::BBTPoint>& grid,
std::vector<TempoMap::BBTPoint>::const_iterator i; std::vector<TempoMap::BBTPoint>::const_iterator i;
Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler Timecode::BBT_Time lower_beat, upper_beat; // the beats at each end of the ruler
framecnt_t beat_before_lower_pos = _session->tempo_map().frame_at_beat (floor(_session->tempo_map().beat_at_frame (lower))); double floor_lower_beat = floor(_session->tempo_map().beat_at_frame (lower));
framecnt_t beat_after_upper_pos = _session->tempo_map().frame_at_beat (floor (_session->tempo_map().beat_at_frame (upper)) + 1.0);
if (floor_lower_beat < 0.0) {
floor_lower_beat = 0.0;
}
const framecnt_t beat_before_lower_pos = _session->tempo_map().frame_at_beat (floor_lower_beat);
const framecnt_t beat_after_upper_pos = _session->tempo_map().frame_at_beat (floor (_session->tempo_map().beat_at_frame (upper)) + 1.0);
_session->bbt_time (beat_before_lower_pos, lower_beat); _session->bbt_time (beat_before_lower_pos, lower_beat);
_session->bbt_time (beat_after_upper_pos, upper_beat); _session->bbt_time (beat_after_upper_pos, upper_beat);