X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=d2f6d2c586a396199af736e6898b6ea0526a2641;hb=e284d1c7a2e18ee7e4aea082c4a57a3504a0f5e8;hp=cc8765c8e5e055d6e77eb9eced8da43b8e3e44e7;hpb=14dc6f7ef9dd76cba75ffe7499d9a81d66c7b152;p=nageru

diff --git a/theme.h b/theme.h
index cc8765c..d2f6d2c 100644
--- a/theme.h
+++ b/theme.h
@@ -15,6 +15,7 @@
 #include "ref_counted_frame.h"
 #include "tweaked_inputs.h"
 
+class CEFCapture;
 class FFmpegCapture;
 class LiveInputWrapper;
 struct InputState;
@@ -34,7 +35,8 @@ public:
 		movit::EffectChain *chain;
 		std::function<void()> setup_chain;
 
-		// May have duplicates.
+		// FRAME_HISTORY frames for each input, in order. Will contain duplicates
+		// for non-interlaced inputs.
 		std::vector<RefCountedFrame> input_frames;
 	};
 
@@ -67,22 +69,65 @@ public:
 		return video_inputs;
 	}
 
-	void register_signal_connection(LiveInputWrapper *live_input, FFmpegCapture *capture)
+#ifdef HAVE_CEF
+	// Should be called as part of HTMLInput.new() only.
+	void register_html_input(CEFCapture *capture)
 	{
-		signal_connections.emplace_back(live_input, capture);
+		html_inputs.push_back(capture);
 	}
 
-	std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> get_signal_connections() const
+	std::vector<CEFCapture *> get_html_inputs() const
 	{
-		return signal_connections;
+		return html_inputs;
+	}
+#endif
+
+	void register_video_signal_connection(LiveInputWrapper *live_input, FFmpegCapture *capture)
+	{
+		video_signal_connections.emplace_back(live_input, capture);
+	}
+
+	std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> get_video_signal_connections() const
+	{
+		return video_signal_connections;
+	}
+
+#ifdef HAVE_CEF
+	void register_html_signal_connection(LiveInputWrapper *live_input, CEFCapture *capture)
+	{
+		html_signal_connections.emplace_back(live_input, capture);
+	}
+
+	std::vector<std::pair<LiveInputWrapper *, CEFCapture *>> get_html_signal_connections() const
+	{
+		return html_signal_connections;
+	}
+#endif
+
+	struct MenuEntry {
+		std::string text;
+		int lua_ref;
+	};
+	std::vector<MenuEntry> get_theme_menu() { return theme_menu; }  // Can be empty for no menu.
+	void theme_menu_entry_clicked(int lua_ref);
+
+	// Will be invoked every time the theme sets a new menu.
+	// Is not invoked for a menu that exists at the time of the callback.
+	void set_theme_menu_callback(std::function<void()> callback)
+	{
+		theme_menu_callback = callback;
 	}
 
 private:
+	void register_constants();
 	void register_class(const char *class_name, const luaL_Reg *funcs);
+	int set_theme_menu(lua_State *L);
+
+	std::string theme_path;
 
 	std::mutex m;
 	lua_State *L;  // Protected by <m>.
-	const InputState *input_state;  // Protected by <m>. Only set temporarily, during chain setup.
+	const InputState *input_state = nullptr;  // Protected by <m>. Only set temporarily, during chain setup.
 	movit::ResourcePool *resource_pool;
 	int num_channels;
 	unsigned num_cards;
@@ -91,9 +136,17 @@ private:
 	std::map<int, int> signal_to_card_mapping;  // Protected by <map_m>.
 
 	std::vector<FFmpegCapture *> video_inputs;
-	std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> signal_connections;
+	std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> video_signal_connections;
+#ifdef HAVE_CEF
+	std::vector<CEFCapture *> html_inputs;
+	std::vector<std::pair<LiveInputWrapper *, CEFCapture *>> html_signal_connections;
+#endif
+
+	std::vector<MenuEntry> theme_menu;
+	std::function<void()> theme_menu_callback;
 
 	friend class LiveInputWrapper;
+	friend int ThemeMenu_set(lua_State *L);
 };
 
 // LiveInputWrapper is a facade on top of an YCbCrInput, exposed to
@@ -106,8 +159,8 @@ public:
 	// Note: <override_bounce> is irrelevant for PixelFormat_8BitBGRA.
 	LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bmusb::PixelFormat pixel_format, bool override_bounce, bool deinterlace);
 
-	void connect_signal(int signal_num);
-	void connect_signal_raw(int signal_num);
+	void connect_signal(int signal_num);  // Must be called with the theme's <m> lock held, since it accesses theme->input_state.
+	void connect_signal_raw(int signal_num, const InputState &input_state);
 	movit::Effect *get_effect() const
 	{
 		if (deinterlace) {