X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=e1c3ed1baa0baa0820705a6c4428ea8d95d9c2d0;hb=fa54f2630c56a1df0046923d6a77b1bd58abf240;hp=71e44bd42cac49b4b9691f358c8f85f545f7addf;hpb=9ba511b7edf9d6875040a0b959d97bd7867ce159;p=nageru

diff --git a/theme.h b/theme.h
index 71e44bd..e1c3ed1 100644
--- a/theme.h
+++ b/theme.h
@@ -34,7 +34,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;
 	};
 
@@ -83,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;
@@ -107,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) {