Add support for FFmpeg inputs.

[nageru] / mixer.h

diff --git a/mixer.h b/mixer.h
index c4f9e6bfebb2470fc41ddd12d4bec89665f346d6..5fb195ec77793faf0a8e9d3989758caf6650b7de 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -336,7 +336,8 @@ private:
 
        enum class CardType {
                LIVE_CARD,
-               FAKE_CAPTURE
+               FAKE_CAPTURE,
+               FFMPEG_INPUT
        };
        void configure_card(unsigned card_index, bmusb::CaptureInterface *capture, CardType card_type, DeckLinkOutput *output);
        void set_output_card_internal(int card_index);  // Should only be called from the mixer thread.
@@ -359,7 +360,7 @@ private:
        void trim_queue(CaptureCard *card, unsigned card_index);
 
        HTTPD httpd;
-       unsigned num_cards;
+       unsigned num_cards, num_video_inputs;
 
        QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface;
        std::unique_ptr<movit::ResourcePool> resource_pool;