X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.h;h=b04050e51d05a6331b21d65409adda3311a61fa0;hb=bcdbb7bdfcfc45b34ccdf36d3950e7e0af6444bd;hp=2a8b9d68b12afc44910a7d03059e44fe97a6b4f7;hpb=25f6b207f157c081495d7abd4ea314b5ef760322;p=nageru

diff --git a/theme.h b/theme.h
index 2a8b9d6..b04050e 100644
--- a/theme.h
+++ b/theme.h
@@ -13,28 +13,18 @@
 
 #include "bmusb/bmusb.h"
 #include "ref_counted_frame.h"
+#include "tweaked_inputs.h"
 
+class FFmpegCapture;
+class LiveInputWrapper;
 struct InputState;
 
 namespace movit {
 class Effect;
 class EffectChain;
 class ResourcePool;
-struct ImageFormat;
-struct YCbCrFormat;
 }  // namespace movit
 
-class NonBouncingYCbCrInput : public movit::YCbCrInput {
-public:
-	NonBouncingYCbCrInput(const movit::ImageFormat &image_format,
-	                      const movit::YCbCrFormat &ycbcr_format,
-	                      unsigned width, unsigned height,
-	                      movit::YCbCrInputSplitting ycbcr_input_splitting = movit::YCBCR_INPUT_PLANAR)
-	    : movit::YCbCrInput(image_format, ycbcr_format, width, height, ycbcr_input_splitting) {}
-
-	bool override_disable_bounce() const override { return true; }
-};
-
 class Theme {
 public:
 	Theme(const std::string &filename, const std::vector<std::string> &search_dirs, movit::ResourcePool *resource_pool, unsigned num_cards);
@@ -66,6 +56,27 @@ public:
 
 	movit::ResourcePool *get_resource_pool() const { return resource_pool; }
 
+	// Should be called as part of VideoInput.new() only.
+	void register_video_input(FFmpegCapture *capture)
+	{
+		video_inputs.push_back(capture);
+	}
+
+	std::vector<FFmpegCapture *> get_video_inputs() const
+	{
+		return video_inputs;
+	}
+
+	void register_signal_connection(LiveInputWrapper *live_input, FFmpegCapture *capture)
+	{
+		signal_connections.emplace_back(live_input, capture);
+	}
+
+	std::vector<std::pair<LiveInputWrapper *, FFmpegCapture *>> get_signal_connections() const
+	{
+		return signal_connections;
+	}
+
 private:
 	void register_class(const char *class_name, const luaL_Reg *funcs);
 
@@ -79,6 +90,9 @@ private:
 	std::mutex map_m;
 	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;
+
 	friend class LiveInputWrapper;
 };
 
@@ -93,6 +107,7 @@ public:
 	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);
 	movit::Effect *get_effect() const
 	{
 		if (deinterlace) {