Add an option --map-signal= to override the default signal-to-card mapping.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index a5f8cfbba6c1d38e3b1cd0a4514567323ad4f239..2b5c5b4257eeef1b0270e5dfc862702e11af0b89 100644 (file)
--- 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);