Make it possible to click the bus peak label to reset it.

[nageru] / audio_mixer.h

diff --git a/audio_mixer.h b/audio_mixer.h
index d00e8ecb4eeb3dd968940575944b9de5e8eba77e..88c2f880cac0fee500d087abec37d1ff9eed1230 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -201,10 +201,20 @@ public:
                return final_makeup_gain_auto;
        }
 
+       void reset_peak(unsigned bus_index);
+
+       struct BusLevel {
+               float current_level_dbfs[2];  // Digital peak of last frame, left and right.
+               float peak_level_dbfs[2];  // Digital peak with hold, left and right.
+               float historic_peak_dbfs;
+               float gain_staging_db;
+               float compressor_attenuation_db;  // A positive number; 0.0 for no attenuation.
+       };
+
        typedef std::function<void(float level_lufs, float peak_db,
-                                  std::vector<float> bus_level_lufs,
+                                  std::vector<BusLevel> bus_levels,
                                   float global_level_lufs, float range_low_lufs, float range_high_lufs,
-                                  std::vector<float> gain_staging_db, float final_makeup_gain_db,
+                                  float final_makeup_gain_db,
                                   float correlation)> audio_level_callback_t;
        void set_audio_level_callback(audio_level_callback_t callback)
        {
@@ -230,6 +240,7 @@ private:
        void reset_alsa_mutex_held(DeviceSpec device_spec);
        std::map<DeviceSpec, DeviceInfo> get_devices_mutex_held() const;
        void update_meters(const std::vector<float> &samples);
+       void add_bus_to_master(unsigned bus_index, const std::vector<float> &samples_bus, std::vector<float> *samples_out);
        void measure_bus_levels(unsigned bus_index, const std::vector<float> &left, const std::vector<float> &right);
        void send_audio_level_callback();
 
@@ -263,11 +274,22 @@ private:
        std::atomic<float> compressor_threshold_dbfs[MAX_BUSES];
        std::atomic<bool> compressor_enabled[MAX_BUSES];
 
+       // Note: The values here are not in dB.
+       struct PeakHistory {
+               float current_level = 0.0f;  // Peak of the last frame.
+               float historic_peak = 0.0f;  // Highest peak since last reset; no falloff.
+               float current_peak = 0.0f;  // Current peak of the peak meter.
+               float last_peak = 0.0f;
+               float age_seconds = 0.0f;   // Time since "last_peak" was set.
+       };
+       PeakHistory peak_history[MAX_BUSES][2];  // Separate for each channel. Under audio_mutex.
+
        double final_makeup_gain = 1.0;  // Under compressor_mutex. Read/write by the user. Note: Not in dB, we want the numeric precision so that we can change it slowly.
        bool final_makeup_gain_auto = true;  // Under compressor_mutex.
 
        InputMapping input_mapping;  // Under audio_mutex.
        std::atomic<float> fader_volume_db[MAX_BUSES] {{ 0.0f }};
+       float last_fader_volume_db[MAX_BUSES] { 0.0f };  // Under audio_mutex.
 
        audio_level_callback_t audio_level_callback = nullptr;
        mutable std::mutex audio_measure_mutex;
@@ -275,12 +297,6 @@ private:
        CorrelationMeasurer correlation;  // Under audio_measure_mutex.
        Resampler peak_resampler;  // Under audio_measure_mutex.
        std::atomic<float> peak{0.0f};
-
-       // Under audio_measure_mutex. Note that Ebu_r128_proc has a broken
-       // copy constructor (it uses the default, but holds arrays),
-       // so we can't just use raw Ebu_r128_proc elements, but need to use
-       // unique_ptrs.
-       std::vector<std::unique_ptr<Ebu_r128_proc>> bus_r128;
 };
 
 #endif  // !defined(_AUDIO_MIXER_H)