Make so that auto white balance is stored per (physical) card, not per signal.

[nageru] / nageru / scene.cpp

diff --git a/nageru/scene.cpp b/nageru/scene.cpp
index ca6cc70a82da09b75ee7c5eed246e14c9d8a35f2..53a64a02c381176b560bb3a4d6b626673c18c382 100644 (file)
--- a/nageru/scene.cpp
+++ b/nageru/scene.cpp
@@ -495,10 +495,10 @@ int Scene::finalize(lua_State* L)
        return 0;
 }
 
-int find_signal_to_connect(lua_State *L, const Block *block)
+int find_card_to_connect(lua_State *L, const Block *block)
 {
-       if (block->signal_type_to_connect == Block::CONNECT_SIGNAL) {
-               return block->signal_to_connect;
+       if (block->signal_type_to_connect == Block::CONNECT_CARD) {
+               return block->card_to_connect;
 #ifdef HAVE_CEF
        } else if (block->signal_type_to_connect == Block::CONNECT_CEF) {
                return block->cef_to_connect->get_card_index();
@@ -520,10 +520,10 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
        // based on the current state of the signals.
        InputStateInfo info(input_state);
        for (Block *block : blocks) {
-               if (block->is_input && block->signal_type_to_connect == Block::CONNECT_SIGNAL) {
+               if (block->is_input && block->signal_type_to_connect == Block::CONNECT_CARD) {
                        EffectType chosen_type = current_type(block);
                        assert(chosen_type == LIVE_INPUT_YCBCR || chosen_type == LIVE_INPUT_YCBCR_WITH_DEINTERLACE);
-                       if (info.last_interlaced[block->signal_to_connect]) {
+                       if (info.last_interlaced[block->card_to_connect]) {
                                block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR_WITH_DEINTERLACE);
                        } else {
                                block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR);
@@ -552,8 +552,8 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
                       chosen_type == LIVE_INPUT_YCBCR_WITH_DEINTERLACE ||
                       chosen_type == LIVE_INPUT_YCBCR_PLANAR ||
                       chosen_type == LIVE_INPUT_BGRA);
-               int signal = find_signal_to_connect(L, input);
-               RGBTriplet wb = theme->get_white_balance_for_signal(signal);
+               int card_idx = find_card_to_connect(L, input);
+               RGBTriplet wb = theme->get_white_balance_for_card(card_idx);
                if (fabs(wb.r - 1.0) < 1e-3 && fabs(wb.g - 1.0) < 1e-3 && fabs(wb.b - 1.0) < 1e-3) {
                        // Neutral white balance.
                        block->currently_chosen_alternative = find_index_of(block, IDENTITY_EFFECT);
@@ -589,7 +589,7 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
        const Scene::Instantiation &instantiation = chains[chain_idx];
        EffectChain *effect_chain = instantiation.chain.get();
 
-       map<LiveInputWrapper *, int> signals_to_connect;
+       map<LiveInputWrapper *, int> cards_to_connect;
        map<ImageInput *, string> images_to_select;
        map<pair<Effect *, string>, int> int_to_set;
        map<pair<Effect *, string>, float> float_to_set;
@@ -603,7 +603,7 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
                    chosen_type == LIVE_INPUT_YCBCR_PLANAR ||
                    chosen_type == LIVE_INPUT_BGRA) {
                        LiveInputWrapper *input = index_and_input.second;
-                       signals_to_connect.emplace(input, find_signal_to_connect(L, block));
+                       cards_to_connect.emplace(input, find_card_to_connect(L, block));
                }
        }
        for (const auto &index_and_input : instantiation.image_inputs) {
@@ -682,13 +682,13 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp
 
        lua_pop(L, 1);
 
-       auto setup_chain = [L, theme, signals_to_connect, images_to_select, int_to_set, float_to_set, vec3_to_set, vec4_to_set, input_state]{
+       auto setup_chain = [L, theme, cards_to_connect, images_to_select, int_to_set, float_to_set, vec3_to_set, vec4_to_set, input_state]{
                lock_guard<mutex> lock(theme->m);
 
-               // Set up state, including connecting signals.
-               for (const auto &input_and_signal : signals_to_connect) {
-                       LiveInputWrapper *input = input_and_signal.first;
-                       input->connect_signal_raw(input_and_signal.second, input_state);
+               // Set up state, including connecting cards.
+               for (const auto &input_and_card : cards_to_connect) {
+                       LiveInputWrapper *input = input_and_card.first;
+                       input->connect_card(input_and_card.second, input_state);
                }
                for (const auto &input_and_filename : images_to_select) {
                        input_and_filename.first->switch_image(input_and_filename.second);
@@ -736,8 +736,8 @@ bool display(Block *block, lua_State *L, int idx)
        if (lua_isnumber(L, idx)) {
                Theme *theme = get_theme_updata(L);
                int signal_idx = luaL_checknumber(L, idx);
-               block->signal_type_to_connect = Block::CONNECT_SIGNAL;
-               block->signal_to_connect = theme->map_signal_to_card(signal_idx);  // FIXME: Assigning a card to something named about signals.
+               block->signal_type_to_connect = Block::CONNECT_CARD;
+               block->card_to_connect = theme->map_signal_to_card(signal_idx);
                block->currently_chosen_alternative = find_index_of(block, LIVE_INPUT_YCBCR);  // Will be changed to deinterlaced at get_chain() time if needed.
                return true;
 #ifdef HAVE_CEF