Make signal mapping changeable by right-clicking on the preview.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index e1fa8163884095b0c6b466871e2cf9757f568868..0c74a8b88c76b1acdb0b779440371c7f51eef0c8 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -646,6 +646,25 @@ void LiveInputWrapper::connect_signal(int signal_num)
        }
 }
 
+namespace {
+
+int call_num_channels(lua_State *L)
+{
+       lua_getglobal(L, "num_channels");
+
+       if (lua_pcall(L, 0, 1, 0) != 0) {
+               fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1));
+               exit(1);
+       }
+
+       int num_channels = luaL_checknumber(L, 1);
+       lua_pop(L, 1);
+       assert(lua_gettop(L) == 0);
+       return num_channels;
+}
+
+}  // namespace
+
 Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_cards)
        : resource_pool(resource_pool), num_cards(num_cards)
 {
@@ -674,16 +693,7 @@ Theme::Theme(const char *filename, ResourcePool *resource_pool, unsigned num_car
        assert(lua_gettop(L) == 0);
 
        // Ask it for the number of channels.
-       lua_getglobal(L, "num_channels");
-
-       if (lua_pcall(L, 0, 1, 0) != 0) {
-               fprintf(stderr, "error running function `num_channels': %s\n", lua_tostring(L, -1));
-               exit(1);
-       }
-
-       num_channels = luaL_checknumber(L, 1);
-       lua_pop(L, 1);
-       assert(lua_gettop(L) == 0);
+       num_channels = call_num_channels(L);
 }
 
 Theme::~Theme()
@@ -772,6 +782,22 @@ string Theme::get_channel_name(unsigned channel)
        return ret;
 }
 
+int Theme::get_channel_signal(unsigned channel)
+{
+       unique_lock<mutex> lock(m);
+       lua_getglobal(L, "channel_signal");
+       lua_pushnumber(L, channel);
+       if (lua_pcall(L, 1, 1, 0) != 0) {
+               fprintf(stderr, "error running function `channel_signal': %s\n", lua_tostring(L, -1));
+               exit(1);
+       }
+
+       int ret = luaL_checknumber(L, 1);
+       lua_pop(L, 1);
+       assert(lua_gettop(L) == 0);
+       return ret;
+}
+
 bool Theme::get_supports_set_wb(unsigned channel)
 {
        unique_lock<mutex> lock(m);
@@ -827,14 +853,23 @@ vector<string> Theme::get_transition_names(float t)
 
 int Theme::map_signal(int signal_num)
 {
+       unique_lock<mutex> lock(map_m);
+       if (signal_to_card_mapping.count(signal_num)) {
+               return signal_to_card_mapping[signal_num];
+       }
        if (signal_num >= int(num_cards)) {
-               if (signals_warned_about.insert(signal_num).second) {
-                       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;
+               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);
        }
-       return signal_num;
+       signal_to_card_mapping[signal_num] = signal_num % num_cards;
+       return signal_num % num_cards;
+}
+
+void Theme::set_signal_mapping(int signal_num, int card_num)
+{
+       unique_lock<mutex> lock(map_m);
+       assert(card_num < int(num_cards));
+       signal_to_card_mapping[signal_num] = card_num;
 }
 
 void Theme::transition_clicked(int transition_num, float t)