X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=mixer.h;fp=mixer.h;h=940dc1308c04445c166b3956aeda6b36cbaa3287;hp=aa3baac2fff99e90b1113f61af65e7f82761f42e;hb=b68d8a25951faf5b967b7a35fa0a363b4b68fbc0;hpb=25ea462c2847313afd702cea1db29199b845fbd4 diff --git a/mixer.h b/mixer.h index aa3baac..940dc13 100644 --- a/mixer.h +++ b/mixer.h @@ -409,7 +409,8 @@ private: enum class CardType { LIVE_CARD, FAKE_CAPTURE, - FFMPEG_INPUT + FFMPEG_INPUT, + CEF_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. @@ -432,7 +433,7 @@ private: std::pair get_channel_color_http(unsigned channel_idx); HTTPD httpd; - unsigned num_cards, num_video_inputs; + unsigned num_cards, num_video_inputs, num_html_inputs; QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface; std::unique_ptr resource_pool;