X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=adfb7cf361f24ea22554c3deab545cbd9de87ad5;hb=327534a3031a332423411c9599c741f2f81657df;hp=aa3baac2fff99e90b1113f61af65e7f82761f42e;hpb=2f4224d7c48b3b22bcb24eb622fe6705fa16375f;p=nageru

diff --git a/mixer.h b/mixer.h
index aa3baac..adfb7cf 100644
--- a/mixer.h
+++ b/mixer.h
@@ -403,13 +403,23 @@ public:
 		return httpd.get_num_connected_clients();
 	}
 
+	std::vector<Theme::MenuEntry> get_theme_menu() { return theme->get_theme_menu(); }
+
+	void theme_menu_entry_clicked(int lua_ref) { return theme->theme_menu_entry_clicked(lua_ref); }
+
+	void set_theme_menu_callback(std::function<void()> callback)
+	{
+		theme->set_theme_menu_callback(callback);
+	}
+
 private:
 	struct CaptureCard;
 
 	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 +442,7 @@ private:
 	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 = 0;
 
 	QSurface *mixer_surface, *h264_encoder_surface, *decklink_output_surface;
 	std::unique_ptr<movit::ResourcePool> resource_pool;
@@ -477,6 +487,15 @@ private:
 		CardType type;
 		std::unique_ptr<DeckLinkOutput> output;
 
+		// CEF only delivers frames when it actually has a change.
+		// If we trim the queue for latency reasons, we could thus
+		// end up in a situation trimming a frame that was meant to
+		// be displayed for a long time, which is really suboptimal.
+		// Thus, if we drop the last frame we have, may_have_dropped_last_frame
+		// is set to true, and the next starvation event will trigger
+		// us requestin a CEF repaint.
+		bool is_cef_capture, may_have_dropped_last_frame = false;
+
 		// If this card is used for output (ie., output_card_index points to it),
 		// it cannot simultaneously be uesd for capture, so <capture> gets replaced
 		// by a FakeCapture. However, since reconstructing the real capture object