fix "monitor mode 11"
see http://www.oofus.co.uk/ardour/Ardour3MonitorModesV2.pdf the overall logic can probably be simplified somewhat track-rec-enable on -> always monitor input
This commit is contained in:
parent
9a25fcbfe1
commit
e9289a19c8
@ -354,7 +354,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
|
||||
|
||||
fill_buffers_with_input (bufs, _input, nframes);
|
||||
|
||||
if (_meter_point == MeterInput && (_monitoring & MonitorInput)) {
|
||||
if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
|
||||
_meter->run (bufs, start_frame, end_frame, nframes, true);
|
||||
}
|
||||
|
||||
|
@ -354,7 +354,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
|
||||
|
||||
fill_buffers_with_input (bufs, _input, nframes);
|
||||
|
||||
if (_meter_point == MeterInput && (_monitoring & MonitorInput)) {
|
||||
if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
|
||||
_meter->run (bufs, start_frame, end_frame, nframes, true);
|
||||
}
|
||||
|
||||
|
@ -948,7 +948,7 @@ Track::metering_state () const
|
||||
bool rv;
|
||||
if (_session.transport_rolling ()) {
|
||||
// audio_track.cc || midi_track.cc roll() runs meter IFF:
|
||||
rv = _meter_point == MeterInput && (_monitoring & MonitorInput);
|
||||
rv = _meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled());
|
||||
} else {
|
||||
// track no_roll() always metering if
|
||||
rv = _meter_point == MeterInput;
|
||||
|
Loading…
Reference in New Issue
Block a user