X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fscene.cpp;h=a44c9a856316d2cf1f3296365b69862498a4e188;hb=5225e714d1c55d2afde256acaf607d53ea21723b;hp=ca6cc70a82da09b75ee7c5eed246e14c9d8a35f2;hpb=0490c42536a845dd6d718a7c58cfb3e3ab02b1ab;p=nageru diff --git a/nageru/scene.cpp b/nageru/scene.cpp index ca6cc70..a44c9a8 100644 --- a/nageru/scene.cpp +++ b/nageru/scene.cpp @@ -18,7 +18,7 @@ extern "C" { using namespace movit; using namespace std; -bool display(Block *block, lua_State *L, int idx); +static bool display(Block *block, lua_State *L, int idx); EffectType current_type(const Block *block) { @@ -339,7 +339,7 @@ const Block *Scene::find_root_input_block(lua_State *L, const Block *block) const Block *parent = find_root_input_block(L, blocks[input_idx]); if (parent != nullptr) { if (ret != nullptr) { - luaL_error(L, "add_auto_white_balance() was connected to more than one input"); + luaL_error(L, "add_white_balance() was connected to more than one input"); } ret = parent; } @@ -347,7 +347,7 @@ const Block *Scene::find_root_input_block(lua_State *L, const Block *block) return ret; } -int Scene::add_auto_white_balance(lua_State* L) +int Scene::add_white_balance(lua_State* L) { assert(lua_gettop(L) >= 1); Scene *scene = (Scene *)luaL_checkudata(L, 1, "Scene"); @@ -375,10 +375,10 @@ int Scene::add_auto_white_balance(lua_State* L) block->inputs.push_back(find_block_from_arg(L, scene, 2)->idx); block->white_balance_controller_block = find_block_from_arg(L, scene, 3); } else { - luaL_error(L, "add_auto_white_balance([input], [white_balance_controller]) takes zero, one or two arguments"); + luaL_error(L, "add_white_balance([input], [white_balance_controller]) takes zero, one or two arguments"); } if (block->white_balance_controller_block == nullptr || !block->white_balance_controller_block->is_input) { - luaL_error(L, "add_auto_white_balance() does not get its white balance from an input"); + luaL_error(L, "add_white_balance() does not get its white balance from an input"); } scene->blocks.push_back(block); @@ -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(Theme *theme, lua_State *L, const Block *block) { if (block->signal_type_to_connect == Block::CONNECT_SIGNAL) { - return block->signal_to_connect; + return theme->map_signal_to_card(block->signal_to_connect); #ifdef HAVE_CEF } else if (block->signal_type_to_connect == Block::CONNECT_CEF) { return block->cef_to_connect->get_card_index(); @@ -523,7 +523,8 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp if (block->is_input && block->signal_type_to_connect == Block::CONNECT_SIGNAL) { 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]) { + int card_index = theme->map_signal_to_card(block->signal_to_connect); + if (info.last_interlaced[card_index]) { 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 +553,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(theme, 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 +590,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 signals_to_connect; + map cards_to_connect; map images_to_select; map, int> int_to_set; map, float> float_to_set; @@ -603,7 +604,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(theme, L, block)); } } for (const auto &index_and_input : instantiation.image_inputs) { @@ -682,13 +683,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 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); @@ -734,10 +735,9 @@ Scene::get_chain(Theme *theme, lua_State *L, unsigned num, const InputState &inp 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_to_connect = 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