remove lamda

daschuer · Nov 7, 2024 · 4b77bd5 · 4b77bd5
1 parent 221879c
commit 4b77bd5
Showing 1 changed file with 28 additions and 35 deletions.
diff --git a/src/effects/backends/builtin/metronomeeffect.cpp b/src/effects/backends/builtin/metronomeeffect.cpp
@@ -135,41 +135,34 @@ void MetronomeEffect::processChannel(
     }
     gs->framesSinceLastClick += engineParameters.framesPerBuffer();
 
-    std::span<CSAMPLE> outputBufferOffset = [&] {
-        if (shouldSync && hasBeatInfo) {
-            double beatFractionBufferEnd = *groupFeatures.beat_fraction_buffer_end;
-            std::optional<GroupFeatureBeatLength> beatLengthAndScratch = groupFeatures.beat_length;
-            if (!beatLengthAndScratch.has_value() || beatLengthAndScratch->scratch_rate == 0.0) {
-                return std::span<CSAMPLE>();
-            }
-            double beatLength = beatLengthAndScratch->frames / beatLengthAndScratch->scratch_rate;
-
-            const bool needsPreviousBeat = beatLength < 0;
-            double beatToBufferEndFrames = std::abs(beatLength) *
-                    (needsPreviousBeat ? (1 - beatFractionBufferEnd)
-                                       : beatFractionBufferEnd);
-            std::size_t beatToBufferEndSamples =
-                    static_cast<std::size_t>(beatToBufferEndFrames) *
-                    mixxx::kEngineChannelOutputCount;
-
-            if (beatToBufferEndSamples <= output.size()) {
-                return output.last(beatToBufferEndSamples);
-            }
-            return std::span<CSAMPLE>();              
-        } else {
-            // EngineParameters::sampleRate in reality returns the framerate.
-            mixxx::audio::SampleRate framesPerSecond = engineParameters.sampleRate();
-            std::size_t offset = (gs->framesSinceLastClick %
-                    framesPerBeat(framesPerSecond, m_pBpmParameter->value())) *
-                    mixxx::kEngineChannelOutputCount; 
-            if (offset < output.size()) {
-                return output.subspan(offset);
-            }
-            return std::span<CSAMPLE>();      
+    if (shouldSync && hasBeatInfo) {
+        double beatFractionBufferEnd = *groupFeatures.beat_fraction_buffer_end;
+        std::optional<GroupFeatureBeatLength> beatLengthAndScratch = groupFeatures.beat_length;
+        if (!beatLengthAndScratch.has_value() || beatLengthAndScratch->scratch_rate == 0.0) {
+            return;
         }
-    }();
-
-    if (!outputBufferOffset.empty()) {
-        gs->framesSinceLastClick = playMonoSamplesWithGain(click, outputBufferOffset, gain);
+        double beatLength = beatLengthAndScratch->frames / beatLengthAndScratch->scratch_rate;
+        const bool needsPreviousBeat = beatLength < 0;
+        double beatToBufferEndFrames = std::abs(beatLength) *
+                (needsPreviousBeat ? (1 - beatFractionBufferEnd)
+                                   : beatFractionBufferEnd);
+        std::size_t beatToBufferEndSamples =
+                static_cast<std::size_t>(beatToBufferEndFrames) *
+                mixxx::kEngineChannelOutputCount;
+
+        if (beatToBufferEndSamples <= output.size()) {
+            gs->framesSinceLastClick = playMonoSamplesWithGain(click, output.last(beatToBufferEndSamples), gain);
+        }            
+    } else {
+        // EngineParameters::sampleRate in reality returns the framerate.
+        mixxx::audio::SampleRate framesPerSecond = engineParameters.sampleRate();
+        std::size_t offset = (gs->framesSinceLastClick %
+                framesPerBeat(framesPerSecond, m_pBpmParameter->value())) *
+                mixxx::kEngineChannelOutputCount; 
+        if (offset < output.size()) {
+             gs->framesSinceLastClick = playMonoSamplesWithGain(click, output.subspan(offset), gain);
+        }   
     }
 }
+
+