X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=e1c3ed1baa0baa0820705a6c4428ea8d95d9c2d0;hb=9e47a2f661b9d292598ef0277e507458e3dad62f;hp=9e9672e0fa5b98d23b8edd897a587a84cc9360ca;hpb=da648fc65da0b5f8e96ff39ce52bdd00fa29b5dc;p=nageru

diff --git a/theme.h b/theme.h
index 9e9672e..e1c3ed1 100644
--- a/theme.h
+++ b/theme.h
@@ -84,7 +84,7 @@ private:
 
 	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;
@@ -108,8 +108,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) {