From de4c0eb27c84a48828e276fc702e139d25eeba72 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 30 Sep 2017 18:01:45 +0200 Subject: Remove Input-meter special-case Now that disk is no longer topper-most but a processor, the special case is no longer needed. --- libs/ardour/track.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'libs/ardour/track.cc') diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 5aad8b9bcf..1e53daff3c 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -465,6 +465,8 @@ Track::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_ */ } + // XXX this needs to go away.. disk-reader or Route::process_output_buffers needs to handle this XXX // + bool be_silent; MonitorState const s = monitoring_state (); /* we are not rolling, so be silent even if we are monitoring disk, as there @@ -494,6 +496,9 @@ Track::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_ if (be_silent) { +#if 0 + // XXX this is also the only user of IO::process_input () + if (_meter_point == MeterInput) { /* still need input monitoring and metering */ @@ -530,6 +535,7 @@ Track::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_ _input->process_input (_meter, start_sample, end_sample, _session.transport_speed(), nframes); } } +#endif passthru_silence (start_sample, end_sample, nframes, 0); @@ -539,10 +545,6 @@ Track::no_roll_unlocked (pframes_t nframes, samplepos_t start_sample, samplepos_ fill_buffers_with_input (bufs, _input, nframes); - if (_meter_point == MeterInput) { - _meter->run (bufs, start_sample, end_sample, _session.transport_speed(), nframes, true); - } - passthru (bufs, start_sample, end_sample, nframes, false, true, false); } -- cgit v1.2.3