If a dead device comes back, put it into the right slot.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 31ae7ae907f79fc1c2ef8f875fb2f9f89a940ed8..f5e72e42e237a5a1df16152b4a3b28aac34d24fb 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -11,7 +11,6 @@
 #include <movit/flat_input.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <zita-resampler/resampler.h>
 
 #include <atomic>
 #include <chrono>
@@ -29,9 +28,7 @@
 #include "alsa_output.h"
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
-#include "correlation_measurer.h"
 #include "defs.h"
-#include "ebu_r128_proc.h"
 #include "httpd.h"
 #include "input_state.h"
 #include "pbo_frame_allocator.h"
@@ -172,15 +169,6 @@ public:
                output_channel[output].set_color_updated_callback(callback);
        }
 
-       typedef std::function<void(float level_lufs, float peak_db,
-                                  float global_level_lufs, float range_low_lufs, float range_high_lufs,
-                                  float gain_staging_db, float final_makeup_gain_db,
-                                  float correlation)> audio_level_callback_t;
-       void set_audio_level_callback(audio_level_callback_t callback)
-       {
-               audio_level_callback = callback;
-       }
-
        std::vector<std::string> get_transition_names()
        {
                return theme->get_transition_names(pts());
@@ -246,6 +234,7 @@ public:
                theme->set_wb(channel, r, g, b);
        }
 
+       // Note: You can also get this through the global variable global_audio_mixer.
        AudioMixer *get_audio_mixer() { return &audio_mixer; }
        const AudioMixer *get_audio_mixer() const { return &audio_mixer; }
 
@@ -254,8 +243,6 @@ public:
                should_cut = true;
        }
 
-       void reset_meters();
-
        unsigned get_num_cards() const { return num_cards; }
 
        std::string get_card_description(unsigned card_index) const {
@@ -326,9 +313,7 @@ private:
        void handle_hotplugged_cards();
        void schedule_audio_resampling_tasks(unsigned dropped_frames, int num_samples_per_frame, int length_per_frame);
        void render_one_frame(int64_t duration);
-       void send_audio_level_callback();
        void audio_thread_func();
-       void process_audio_one_frame(int64_t frame_pts_int, int num_samples, ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy);
        void subsample_chroma(GLuint src_tex, GLuint dst_dst);
        void release_display_frame(DisplayFrame *frame);
        double pts() { return double(pts_int) / TIMEBASE; }
@@ -382,9 +367,9 @@ private:
 
                int last_timecode = -1;  // Unwrapped.
        };
-       CaptureCard cards[MAX_CARDS];  // protected by <bmusb_mutex>
-       AudioMixer audio_mixer;
-       void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_CARDS], bool has_new_frame[MAX_CARDS], int num_samples[MAX_CARDS]);
+       CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
+       AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
+       void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], int num_samples[MAX_VIDEO_CARDS]);
 
        InputState input_state;
 
@@ -426,13 +411,6 @@ private:
        std::atomic<bool> should_quit{false};
        std::atomic<bool> should_cut{false};
 
-       audio_level_callback_t audio_level_callback = nullptr;
-       mutable std::mutex audio_measure_mutex;
-       Ebu_r128_proc r128;  // Under audio_measure_mutex.
-       CorrelationMeasurer correlation;  // Under audio_measure_mutex.
-       Resampler peak_resampler;  // Under audio_measure_mutex.
-       std::atomic<float> peak{0.0f};
-
        std::unique_ptr<ALSAOutput> alsa;
 
        struct AudioTask {
@@ -445,10 +423,10 @@ private:
        std::queue<AudioTask> audio_task_queue;  // Under audio_mutex.
 
        // For mode scanning.
-       bool is_mode_scanning[MAX_CARDS]{ false };
-       std::vector<uint32_t> mode_scanlist[MAX_CARDS];
-       unsigned mode_scanlist_index[MAX_CARDS]{ 0 };
-       std::chrono::steady_clock::time_point last_mode_scan_change[MAX_CARDS];
+       bool is_mode_scanning[MAX_VIDEO_CARDS]{ false };
+       std::vector<uint32_t> mode_scanlist[MAX_VIDEO_CARDS];
+       unsigned mode_scanlist_index[MAX_VIDEO_CARDS]{ 0 };
+       std::chrono::steady_clock::time_point last_mode_scan_change[MAX_VIDEO_CARDS];
 };
 
 extern Mixer *global_mixer;