X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=940dc1308c04445c166b3956aeda6b36cbaa3287;hb=f1ce3c5618f769b1388b39c637877d242c8ddeed;hp=1d2e200ca45be9acb886f487b30ff5d2f478805a;hpb=33929966f03efc11d23d4ec5fdf492ff09c2ab9e;p=nageru

diff --git a/mixer.h b/mixer.h
index 1d2e200..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.
@@ -428,9 +429,11 @@ private:
 	void release_display_frame(DisplayFrame *frame);
 	double pts() { return double(pts_int) / TIMEBASE; }
 	void trim_queue(CaptureCard *card, size_t safe_queue_length);
+	std::pair<std::string, std::string> get_channels_json();
+	std::pair<std::string, std::string> 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<movit::ResourcePool> resource_pool;