diff options
Diffstat (limited to 'libs/ardour/midi_diskstream.cc')
| -rw-r--r-- | libs/ardour/midi_diskstream.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 0a9b361f35..e2233fa418 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -171,13 +171,7 @@ MidiDiskstream::non_realtime_input_change () get_input_sources (); set_capture_offset (); - - if (first_input_change) { - set_align_style (_persistent_alignment_style); - first_input_change = false; - } else { - set_align_style_from_io (); - } + set_align_style_from_io (); input_change_pending.type = IOChange::NoChange; @@ -1110,7 +1104,7 @@ MidiDiskstream::transport_looped (framepos_t transport_frame) capture_captured += _capture_offset; if (_alignment_style == ExistingMaterial) { - capture_captured += _session.worst_output_latency(); + capture_captured += _session.worst_playback_latency(); } else { capture_captured += _roll_delay; } @@ -1389,6 +1383,10 @@ MidiDiskstream::set_align_style_from_io () { bool have_physical = false; + if (_alignment_choice != Automatic) { + return; + } + if (_io == 0) { return; } |