X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=b60df1490190059fb0a0900ed543aab6fa0b7266;hb=2b806ed340112b4b464b6f2b9c34e4873de5f1c5;hp=2b3b4aba3a4e7297403b7493ad5a13ecddc1758a;hpb=86f32b5a80b232e6d824776a87ecc1b5f8fbfa96;p=nageru

diff --git a/theme.h b/theme.h
index 2b3b4ab..b60df14 100644
--- a/theme.h
+++ b/theme.h
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "defs.h"
+#include "input_state.h"
 #include "ref_counted_frame.h"
 
 namespace movit {
@@ -47,7 +48,7 @@ public:
 		std::vector<RefCountedFrame> input_frames;
 	};
 
-	Chain get_chain(unsigned num, float t, unsigned width, unsigned height);
+	Chain get_chain(unsigned num, float t, unsigned width, unsigned height, InputState input_state);
 
 	int get_num_channels() const { return num_channels; }
 	int map_signal(int signal_num);
@@ -65,15 +66,13 @@ private:
 	void register_class(const char *class_name, const luaL_Reg *funcs);
 
 	std::mutex m;
-	lua_State *L;
+	lua_State *L;  // Protected by <m>.
+	const InputState *input_state;  // Protected by <m>. Only set temporarily, during chain setup.
 	movit::ResourcePool *resource_pool;
 	int num_channels;
 	unsigned num_cards;
 	std::set<int> signals_warned_about;
 
-	// All input frames needed for the current chain. Filled during call to get_chain(),
-	// as inputs get connected.
-	std::vector<RefCountedFrame> *used_input_frames_collector;
 	friend class LiveInputWrapper;
 };
 
@@ -90,7 +89,6 @@ public:
 private:
 	Theme *theme;  // Not owned by us.
 	movit::YCbCrInput *input;  // Owned by the chain.
-	int connected_signal_num = 0;
 };
 
 #endif  // !defined(_THEME_H)