Write 1.4.0 changelog.

[nageru] / audio_mixer.h

diff --git a/audio_mixer.h b/audio_mixer.h
index 1570d26373eb3592fbf897990954521ba36d1fb4..85f9aedf96a77779b31e3e9a5433710076659208 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -8,19 +8,19 @@
 //
 // All operations on AudioMixer (except destruction) are thread-safe.
 
-#include <math.h>
+#include <assert.h>
 #include <stdint.h>
+#include <zita-resampler/resampler.h>
 #include <atomic>
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <set>
+#include <string>
 #include <vector>
-#include <zita-resampler/resampler.h>
 
-#include "alsa_input.h"
 #include "alsa_pool.h"
-#include "bmusb/bmusb.h"
 #include "correlation_measurer.h"
 #include "db.h"
 #include "defs.h"
@@ -30,6 +30,8 @@
 #include "resampling_queue.h"
 #include "stereocompressor.h"
 
+class DeviceSpecProto;
+
 namespace bmusb {
 struct AudioFormat;
 }  // namespace bmusb
@@ -67,6 +69,9 @@ public:
        float get_fader_volume(unsigned bus_index) const { return fader_volume_db[bus_index]; }
        void set_fader_volume(unsigned bus_index, float level_db) { fader_volume_db[bus_index] = level_db; }
 
+       bool get_mute(unsigned bus_index) const { return mute[bus_index]; }
+       void set_mute(unsigned bus_index, bool muted) { mute[bus_index] = muted; }
+
        // Note: This operation holds all ALSA devices (see ALSAPool::get_devices()).
        // You will need to call set_input_mapping() to get the hold state correctly,
        // or every card will be held forever.
@@ -90,9 +95,32 @@ public:
        // Note: The card should be held (currently this isn't enforced, though).
        void serialize_device(DeviceSpec device_spec, DeviceSpecProto *device_spec_proto);
 
+       enum class MappingMode {
+               // A single bus, only from a video card (no ALSA devices),
+               // only channel 1 and 2, locked to +0 dB. Note that this is
+               // only an UI abstraction around exactly the same audio code
+               // as MULTICHANNEL; it's just less flexible.
+               SIMPLE,
+
+               // Full, arbitrary mappings.
+               MULTICHANNEL
+       };
+
+       // Automatically sets mapping mode to MappingMode::SIMPLE.
+       void set_simple_input(unsigned card_index);
+
+       // If mapping mode is not representable as a MappingMode::SIMPLE type
+       // mapping, returns numeric_limits<unsigned>::max().
+       unsigned get_simple_input() const;
+
+       // Implicitly sets mapping mode to MappingMode::MULTICHANNEL.
        void set_input_mapping(const InputMapping &input_mapping);
+
+       MappingMode get_mapping_mode() const;
        InputMapping get_input_mapping() const;
 
+       unsigned num_buses() const;
+
        void set_locut_cutoff(float cutoff_hz)
        {
                locut_cutoff_hz = cutoff_hz;
@@ -258,6 +286,7 @@ public:
        // or set_* functions for that bus.
        struct BusSettings {
                float fader_volume_db;
+               bool muted;
                bool locut_enabled;
                float eq_level_db[NUM_EQ_BANDS];
                float gain_staging_db;
@@ -296,6 +325,7 @@ private:
        void measure_bus_levels(unsigned bus_index, const std::vector<float> &left, const std::vector<float> &right);
        void send_audio_level_callback();
        std::vector<DeviceSpec> get_active_devices() const;
+       void set_input_mapping_lock_held(const InputMapping &input_mapping);
 
        unsigned num_cards;
 
@@ -314,6 +344,7 @@ private:
        mutable std::mutex compressor_mutex;
        std::unique_ptr<StereoCompressor> level_compressor[MAX_BUSES];  // Under compressor_mutex. Used to set/override gain_staging_db if <level_compressor_enabled>.
        float gain_staging_db[MAX_BUSES];  // Under compressor_mutex.
+       float last_gain_staging_db[MAX_BUSES];  // Under compressor_mutex.
        bool level_compressor_enabled[MAX_BUSES];  // Under compressor_mutex.
 
        static constexpr float ref_level_dbfs = -14.0f;  // Chosen so that we end up around 0 LU in practice.
@@ -339,8 +370,10 @@ private:
        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.
 
+       MappingMode current_mapping_mode;  // Under audio_mutex.
        InputMapping input_mapping;  // Under audio_mutex.
        std::atomic<float> fader_volume_db[MAX_BUSES] {{ 0.0f }};
+       std::atomic<bool> mute[MAX_BUSES] {{ false }};
        float last_fader_volume_db[MAX_BUSES] { 0.0f };  // Under audio_mutex.
        std::atomic<float> eq_level_db[MAX_BUSES][NUM_EQ_BANDS] {{{ 0.0f }}};
        float last_eq_level_db[MAX_BUSES][NUM_EQ_BANDS] {{ 0.0f }};