Rename “name” to “display name”.

[nageru] / audio_mixer.h

diff --git a/audio_mixer.h b/audio_mixer.h
index c845a26608aec82a3534826aacb86fd418d2ded1..21ea37159b818d31c64da917773726ad1d67b69b 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -48,7 +48,7 @@ struct DeviceSpec {
        }
 };
 struct DeviceInfo {
-       std::string name;
+       std::string display_name;
        unsigned num_channels;
 };
 
@@ -93,6 +93,13 @@ public:
        bool add_audio(DeviceSpec device_spec, const uint8_t *data, unsigned num_samples, bmusb::AudioFormat audio_format, int64_t frame_length);
        bool add_silence(DeviceSpec device_spec, unsigned samples_per_frame, unsigned num_frames, int64_t frame_length);
 
+       // If a given device is offline for whatever reason and cannot deliver audio
+       // (by means of add_audio() or add_silence()), you can call put it in silence mode,
+       // where it will be taken to only output silence. Note that when taking it _out_
+       // of silence mode, the resampler will be reset, so that old audio will not
+       // affect it. Same true/false behavior as add_audio().
+       bool silence_card(DeviceSpec device_spec, bool silence);
+
        std::vector<float> get_output(double pts, unsigned num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy);
 
        void set_fader_volume(unsigned bus_index, float level_db) { fader_volume_db[bus_index] = level_db; }
@@ -108,7 +115,7 @@ public:
                return alsa_pool.get_card_state(index);
        }
 
-       void set_name(DeviceSpec device_spec, const std::string &name);
+       void set_display_name(DeviceSpec device_spec, const std::string &name);
 
        void set_input_mapping(const InputMapping &input_mapping);
        InputMapping get_input_mapping() const;
@@ -255,14 +262,33 @@ public:
                audio_level_callback = callback;
        }
 
+       typedef std::function<void()> state_changed_callback_t;
+       void set_state_changed_callback(state_changed_callback_t callback)
+       {
+               state_changed_callback = callback;
+       }
+
+       state_changed_callback_t get_state_changed_callback() const
+       {
+               return state_changed_callback;
+       }
+
+       void trigger_state_changed_callback()
+       {
+               if (state_changed_callback != nullptr) {
+                       state_changed_callback();
+               }
+       }
+
 private:
        struct AudioDevice {
                std::unique_ptr<ResamplingQueue> resampling_queue;
                int64_t next_local_pts = 0;
-               std::string name;
+               std::string display_name;
                unsigned capture_frequency = OUTPUT_FREQUENCY;
                // Which channels we consider interesting (ie., are part of some input_mapping).
                std::set<unsigned> interesting_channels;
+               bool silenced = false;
        };
 
        const AudioDevice *find_audio_device(DeviceSpec device_spec) const
@@ -330,6 +356,7 @@ private:
        std::atomic<float> eq_level_db[MAX_BUSES][NUM_EQ_BANDS] {{{ 0.0f }}};
 
        audio_level_callback_t audio_level_callback = nullptr;
+       state_changed_callback_t state_changed_callback = nullptr;
        mutable std::mutex audio_measure_mutex;
        Ebu_r128_proc r128;  // Under audio_measure_mutex.
        CorrelationMeasurer correlation;  // Under audio_measure_mutex.