Remove a sort-of obsolete TODO.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index d7f50cf61baf891c13c9cab3c201f40fed57694c..312566d891e0371eac7ebf765299480fec074f42 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -29,6 +29,8 @@
 #include "resampler.h"
 #include "theme.h"
 #include "timebase.h"
+#include "stereocompressor.h"
+#include "filter.h"
 
 class H264Encoder;
 class QSurface;
@@ -95,7 +97,9 @@ public:
                output_channel[output].set_frame_ready_callback(callback);
        }
 
-       typedef std::function<void(float, float, float, float, float)> audio_level_callback_t;
+       typedef std::function<void(float level_lufs, float peak_db,
+                                  float global_level_lufs, float range_low_lufs, float range_high_lufs,
+                                  float auto_gain_staging_db)> audio_level_callback_t;
        void set_audio_level_callback(audio_level_callback_t callback)
        {
                audio_level_callback = callback;
@@ -161,11 +165,10 @@ private:
                QSurface *surface;
                QOpenGLContext *context;
 
-               bool new_data_ready = false;  // Whether new_frame and new_frame_audio contains anything.
+               bool new_data_ready = false;  // Whether new_frame contains anything.
                bool should_quit = false;
                RefCountedFrame new_frame;
                GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
-               std::vector<float> new_frame_audio;
                std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
                unsigned dropped_frames = 0;  // Before new_frame.
 
@@ -204,6 +207,12 @@ private:
 
        // TODO: Implement oversampled peak detection.
        float peak = 0.0f;
+
+       StereoFilter locut;  // Cutoff 150 Hz, 24 dB/oct.
+
+       // First compressor; takes us up to about -12 dBFS.
+       StereoCompressor level_compressor;
+       float last_gain_staging_db = 0.0f;
 };
 
 extern Mixer *global_mixer;