Fix an issue where an ALSA card that was dead on boot could not be plugged in.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index 289ce45c9b5542da424942b4205ec825605d5848..5a3e203dc9dc0dd5f02c6eb2c100364313521291 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -288,8 +288,8 @@ public:
        }
 
        // 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; }
+       AudioMixer *get_audio_mixer() { return audio_mixer.get(); }
+       const AudioMixer *get_audio_mixer() const { return audio_mixer.get(); }
 
        void schedule_cut()
        {
@@ -322,6 +322,11 @@ public:
                return cards[card_index].output != nullptr;
        }
 
+       bool card_is_ffmpeg(unsigned card_index) const {
+               assert(card_index < num_cards + num_video_inputs);
+               return cards[card_index].type == CardType::FFMPEG_INPUT;
+       }
+
        std::map<uint32_t, bmusb::VideoMode> get_available_video_modes(unsigned card_index) const {
                assert(card_index < num_cards);
                return cards[card_index].capture->get_available_video_modes();
@@ -369,6 +374,10 @@ public:
                cards[card_index].capture->set_audio_input(input);
        }
 
+       std::string get_ffmpeg_filename(unsigned card_index) const;
+
+       void set_ffmpeg_filename(unsigned card_index, const std::string &filename);
+
        void change_x264_bitrate(unsigned rate_kbit) {
                video_encoder->change_x264_bitrate(rate_kbit);
        }
@@ -442,7 +451,7 @@ private:
        std::pair<std::string, std::string> get_channel_color_http(unsigned channel_idx);
 
        HTTPD httpd;
-       unsigned num_cards, num_video_inputs, num_html_inputs;
+       unsigned num_cards, num_video_inputs, num_html_inputs = 0;
 
        QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -548,7 +557,7 @@ private:
        JitterHistory output_jitter_history;
        CaptureCard cards[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
        YCbCrInterpretation ycbcr_interpretation[MAX_VIDEO_CARDS];  // Protected by <card_mutex>.
-       AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
+       std::unique_ptr<AudioMixer> audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
        bool input_card_is_master_clock(unsigned card_index, unsigned master_card_index) const;
        struct OutputFrameInfo {
                int dropped_frames;  // Since last frame.