X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=theme.cpp;h=ed187e5561189eda91a3e8e2d389a72aadec58a0;hb=16c0e5da7fa7b4eeea79470c24697a1ba193f071;hp=a5f8cfbba6c1d38e3b1cd0a4514567323ad4f239;hpb=6f8690087b69b42a1d21d783d6cf60bcd8e9f1d3;p=nageru

diff --git a/theme.cpp b/theme.cpp
index a5f8cfb..ed187e5 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -24,6 +24,7 @@
 #include <memory>
 
 #include "defs.h"
+#include "flags.h"
 #include "image_input.h"
 #include "mixer.h"
 
@@ -695,7 +696,7 @@ int call_num_channels(lua_State *L)
 }  // namespace
 
 Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
-	: resource_pool(resource_pool), num_cards(num_cards)
+	: resource_pool(resource_pool), num_cards(num_cards), signal_to_card_mapping(global_flags.default_stream_mapping)
 {
 	L = luaL_newstate();
         luaL_openlibs(L);
@@ -761,7 +762,12 @@ Theme::Chain Theme::get_chain(unsigned num, float t, unsigned width, unsigned he
 		exit(1);
 	}
 
-	chain.chain = (EffectChain *)luaL_checkudata(L, -2, "EffectChain");
+	chain.chain = (EffectChain *)luaL_testudata(L, -2, "EffectChain");
+	if (chain.chain == nullptr) {
+		fprintf(stderr, "get_chain() for chain number %d did not return an EffectChain\n",
+			num);
+		exit(1);
+	}
 	if (!lua_isfunction(L, -1)) {
 		fprintf(stderr, "Argument #-1 should be a function\n");
 		exit(1);
@@ -805,11 +811,16 @@ string Theme::get_channel_name(unsigned channel)
 		fprintf(stderr, "error running function `channel_name': %s\n", lua_tostring(L, -1));
 		exit(1);
 	}
+	const char *ret = lua_tostring(L, -1);
+	if (ret == nullptr) {
+		fprintf(stderr, "function `channel_name' returned nil for channel %d\n", channel);
+		exit(1);
+	}
 
-	string ret = lua_tostring(L, -1);
+	string retstr = ret;
 	lua_pop(L, 1);
 	assert(lua_gettop(L) == 0);
-	return ret;
+	return retstr;
 }
 
 int Theme::get_channel_signal(unsigned channel)
@@ -838,10 +849,16 @@ std::string Theme::get_channel_color(unsigned channel)
 		exit(1);
 	}
 
-	std::string ret = checkstdstring(L, -1);
+	const char *ret = lua_tostring(L, -1);
+	if (ret == nullptr) {
+		fprintf(stderr, "function `channel_color' returned nil for channel %d\n", channel);
+		exit(1);
+	}
+
+	string retstr = ret;
 	lua_pop(L, 1);
 	assert(lua_gettop(L) == 0);
-	return ret;
+	return retstr;
 }
 
 bool Theme::get_supports_set_wb(unsigned channel)