diff options
author | Robin Gareus <robin@gareus.org> | 2017-09-30 16:45:45 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-09-30 16:45:45 +0200 |
commit | 5fa9f8b399726e248412ebcfdeb8ed751f5a48d4 (patch) | |
tree | d543ed6861cda53c943e989f2dab5274c8fd8223 /libs/ardour/midi_track.cc | |
parent | 697d29cdc2a59c698d2771f1dbec9a726a123843 (diff) |
Towards fixing no_roll()
Currently ::roll() may actually be a ::no_roll() under some circumstances.
This can also happen during count-in:
transport_stopped () == transport_rolling()
and during latency-preroll:
Global session-transport speed != 0, some tracks already roll,
read data from disk and feed latent plugins.
but other non-latent tracks or busses don't roll and still have to
behave like the switch from no_roll() to roll() has not yet happened.
This changes the game WRT to monitoring as well, previously, Route:roll()
called Route::no_roll_unlocked () for conditions outlined above.
Now Track::no_roll_unlocked is called and in some cases wrongly clears
the buffers before the signal hits the disk-writer. (more work is needed
related to 61f8e53b)
On the upside this also fixes an issue with MidiTrack::no_roll not keeping
a lock while pushing data into the step-edit-ringbuffer.
This is also a step towards consolidating all entry points:
::roll(), ::no_roll(), ::silent_roll() in the Route class.
Diffstat (limited to 'libs/ardour/midi_track.cc')
-rw-r--r-- | libs/ardour/midi_track.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index dc5f3f0a80..2e5fd2a0b4 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -318,9 +318,9 @@ MidiTrack::update_controls(const BufferSet& bufs) } int -MidiTrack::no_roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool state_changing) +MidiTrack::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool state_changing) { - int ret = Track::no_roll (nframes, start_sample, end_sample, state_changing); + int ret = Track::no_roll_unlocked (nframes, start_sample, end_sample, state_changing); if (ret == 0 && _step_editing) { push_midi_input_to_step_edit_ringbuffer (nframes); |