X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=f32f637c03cb0aa683cece7d1fbaa4ed1cf60433;hb=d7bba4abb3d56893399578f0540b9ded0a28380f;hp=9914952948477e1a6223f23e298057b9ba34a691;hpb=be250b0bb36e5cca60feb810461c116495bcc357;p=nageru

diff --git a/theme.cpp b/theme.cpp
index 9914952..f32f637 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -1,20 +1,29 @@
-#include <stdio.h>
+#include "theme.h"
+
+#include <assert.h>
+#include <lauxlib.h>
 #include <lua.h>
 #include <lualib.h>
-#include <lauxlib.h>
-#include <new>
-#include <utility>
-
+#include <movit/effect.h>
 #include <movit/effect_chain.h>
-#include <movit/ycbcr_input.h>
-#include <movit/white_balance_effect.h>
-#include <movit/resample_effect.h>
-#include <movit/padding_effect.h>
+#include <movit/image_format.h>
+#include <movit/mix_effect.h>
 #include <movit/overlay_effect.h>
+#include <movit/padding_effect.h>
+#include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
-#include <movit/mix_effect.h>
+#include <movit/white_balance_effect.h>
+#include <movit/ycbcr.h>
+#include <movit/ycbcr_input.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cstddef>
+#include <new>
+#include <utility>
 
-#include "theme.h"
+namespace movit {
+class ResourcePool;
+}  // namespace movit
 
 #define WIDTH 1280  // FIXME
 #define HEIGHT 720  // FIXME
@@ -372,8 +381,8 @@ void LiveInputWrapper::connect_signal(int signal_num)
 	theme->connect_signal(input, signal_num);
 }
 
-Theme::Theme(const char *filename, ResourcePool *resource_pool)
-	: resource_pool(resource_pool)
+Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
+	: resource_pool(resource_pool), num_cards(num_cards)
 {
 	L = luaL_newstate();
         luaL_openlibs(L);
@@ -483,6 +492,11 @@ std::vector<std::string> Theme::get_transition_names(float t)
 
 void Theme::connect_signal(YCbCrInput *input, int signal_num)
 {
+	if (signal_num >= int(num_cards)) {
+		fprintf(stderr, "WARNING: Theme asked for input %d, but we only have %u card(s).\n", signal_num, num_cards);
+		fprintf(stderr, "Mapping to card %d instead.\n", signal_num % num_cards);
+		signal_num %= num_cards;
+	}
 	input->set_texture_num(0, input_textures[signal_num].tex_y);
 	input->set_texture_num(1, input_textures[signal_num].tex_cbcr);
 }