Hook up the reset meters button.

[nageru] / mixer.cpp

diff --git a/mixer.cpp b/mixer.cpp
index 656cdfaf39feb9ef67b79464fffacde678c2e5c1..a91b3d8cc843c556dd376946eb05be9988e78e3a 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -599,7 +599,7 @@ void Mixer::process_audio_one_frame()
 //     printf("limiter=%+5.1f  compressor=%+5.1f\n", 20.0*log10(limiter_att), 20.0*log10(compressor_att));
 
        // Find peak and R128 levels.
-       peak = std::max(peak, find_peak(samples_out));
+       peak = max<float>(peak, find_peak(samples_out));
        vector<float> left, right;
        deinterleave_samples(samples_out, &left, &right);
        float *ptrs[] = { left.data(), right.data() };
@@ -694,6 +694,13 @@ void Mixer::channel_clicked(int preview_num)
        theme->channel_clicked(preview_num);
 }
 
+void Mixer::reset_meters()
+{
+       peak = 0.0f;
+       r128.reset();
+       r128.integr_start();
+}
+
 Mixer::OutputChannel::~OutputChannel()
 {
        if (has_current_frame) {