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

Promote the preroll_seconds config option to include musical time:

Browse source 
Interpret negative preroll time as bars
This commit is contained in:
Robin Gareus 2017-01-18 23:47:50 +01:00
parent d650b3c292
commit ef64c7ba19
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/editor_ops.cc
View file

@ -2609,17 +2609,16 @@ Editor::play_selection ()
framepos_t
Editor::get_preroll (framepos_t pos)
{
#if 0 // TODO: this needs a config option, or special case (e.g. negative get_preroll_seconds ())
if (pos >= 0) {
const float pr = Config->get_preroll_seconds();
if (pos >= 0 && pr < 0) {
/* currently 1 bar's worth of pre-roll, not aligned to bar/beat
* to align to a bar before pos, see count_in, session_transport.cc
*/
const Tempo& tempo = _session->tempo_map().tempo_at_frame (pos);
const Meter& meter = _session->tempo_map().meter_at_frame (pos);
return meter.frames_per_bar (tempo, _session->frame_rate());
return meter.frames_per_bar (tempo, _session->frame_rate()) * -pr;
}
#endif
return Config->get_preroll_seconds() * _session->frame_rate();
return pr * _session->frame_rate();
}