Add red and green borders around channels to mark them as used for live and preview.

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index e1fa8163884095b0c6b466871e2cf9757f568868..aefc081e97847d9349079fcc502d1e9161f1cd90 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -2,8 +2,7 @@
 
 #include <assert.h>
 #include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
+#include <lua.hpp>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
@@ -45,7 +44,7 @@ struct InputStateInfo {
        InputStateInfo(const InputState& input_state);
 
        unsigned last_width[MAX_CARDS], last_height[MAX_CARDS];
-       bool last_interlaced[MAX_CARDS];
+       bool last_interlaced[MAX_CARDS], last_has_signal[MAX_CARDS];
        unsigned last_frame_rate_nom[MAX_CARDS], last_frame_rate_den[MAX_CARDS];
 };
 
@@ -56,12 +55,14 @@ InputStateInfo::InputStateInfo(const InputState &input_state)
                if (frame.frame == nullptr) {
                        last_width[signal_num] = last_height[signal_num] = 0;
                        last_interlaced[signal_num] = false;
+                       last_has_signal[signal_num] = false;
                        continue;
                }
                const PBOFrameAllocator::Userdata *userdata = (const PBOFrameAllocator::Userdata *)frame.frame->userdata;
                last_width[signal_num] = userdata->last_width[frame.field_number];
                last_height[signal_num] = userdata->last_height[frame.field_number];
                last_interlaced[signal_num] = userdata->last_interlaced;
+               last_has_signal[signal_num] = userdata->last_has_signal;
                last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom;
                last_frame_rate_den[signal_num] = userdata->last_frame_rate_den;
        }
@@ -360,6 +361,16 @@ int InputStateInfo_get_interlaced(lua_State* L)
        return 1;
 }
 
+int InputStateInfo_get_has_signal(lua_State* L)
+{
+       assert(lua_gettop(L) == 2);
+       InputStateInfo *input_state_info = get_input_state_info(L, 1);
+       Theme *theme = get_theme_updata(L);
+       int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+       lua_pushboolean(L, input_state_info->last_has_signal[signal_num]);
+       return 1;
+}
+
 int InputStateInfo_get_frame_rate_nom(lua_State* L)
 {
        assert(lua_gettop(L) == 2);
@@ -527,6 +538,7 @@ const luaL_Reg InputStateInfo_funcs[] = {
        { "get_width", InputStateInfo_get_width },
        { "get_height", InputStateInfo_get_height },
        { "get_interlaced", InputStateInfo_get_interlaced },
+       { "get_has_signal", InputStateInfo_get_has_signal },
        { "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom },
        { "get_frame_rate_den", InputStateInfo_get_frame_rate_den },
        { NULL, NULL }
@@ -646,6 +658,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 +705,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 +794,38 @@ 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;
+}
+
+std::string Theme::get_channel_color(unsigned channel)
+{
+       unique_lock<mutex> lock(m);
+       lua_getglobal(L, "channel_color");
+       lua_pushnumber(L, channel);
+       if (lua_pcall(L, 1, 1, 0) != 0) {
+               fprintf(stderr, "error running function `channel_color': %s\n", lua_tostring(L, -1));
+               exit(1);
+       }
+
+       std::string ret = checkstdstring(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 +881,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)