X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=b60df1490190059fb0a0900ed543aab6fa0b7266;hb=78f7565bc0a089afdf957170d179af8b460c28d5;hp=a5ecebc5d8ba3746733a162383c3bfd82daac216;hpb=a98732df9454028ddaa54a9d07b5d7513767bfe9;p=nageru

diff --git a/theme.h b/theme.h
index a5ecebc..b60df14 100644
--- a/theme.h
+++ b/theme.h
@@ -16,6 +16,8 @@
 #include <vector>
 
 #include "defs.h"
+#include "input_state.h"
+#include "ref_counted_frame.h"
 
 namespace movit {
 class ResourcePool;
@@ -23,8 +25,6 @@ struct ImageFormat;
 struct YCbCrFormat;
 }  // namespace movit
 
-#define MAX_CARDS 16
-
 class NonBouncingYCbCrInput : public movit::YCbCrInput {
 public:
 	NonBouncingYCbCrInput(const movit::ImageFormat &image_format,
@@ -40,17 +40,18 @@ class Theme {
 public:
 	Theme(const char *filename, movit::ResourcePool *resource_pool, unsigned num_cards);
 
-	std::pair<movit::EffectChain *, std::function<void()>>
-	get_chain(unsigned num, float t, unsigned width, unsigned height);
+	struct Chain {
+		movit::EffectChain *chain;
+		std::function<void()> setup_chain;
 
-	void set_input_textures(int signal_num, GLuint tex_y, GLuint tex_cbcr, GLuint width, GLuint height) {
-		auto &tex = input_textures[signal_num];
-		tex.tex_y = tex_y;
-		tex.tex_cbcr = tex_cbcr;
-		tex.width = width;
-		tex.height = height;
-	}
-	int get_num_channels() { return num_channels; }
+		// May have duplicates.
+		std::vector<RefCountedFrame> input_frames;
+	};
+
+	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);
 	std::string get_channel_name(unsigned channel);
 	bool get_supports_set_wb(unsigned channel);
 	void set_wb(unsigned channel, double r, double g, double b);
@@ -65,15 +66,14 @@ 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;
-	struct {
-		GLuint tex_y = 0, tex_cbcr = 0;
-		GLuint width = WIDTH, height = HEIGHT;
-	} input_textures[MAX_CARDS];
 	int num_channels;
 	unsigned num_cards;
 	std::set<int> signals_warned_about;
+
+	friend class LiveInputWrapper;
 };
 
 class LiveInputWrapper {
@@ -89,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)