From 5225e714d1c55d2afde256acaf607d53ea21723b Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 29 Mar 2020 15:00:35 +0200 Subject: [PATCH] Rename add_auto_white_balance() to add_white_balance(). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit “auto” white balance sounds like we are doing some kind of analysis to find the correct white balance, which we're not, so rename before release to reduce the chance of confusion. --- nageru/scene.cpp | 8 ++++---- nageru/scene.h | 2 +- nageru/theme.cpp | 2 +- nageru/theme.lua | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nageru/scene.cpp b/nageru/scene.cpp index 7a8e882..a44c9a8 100644 --- a/nageru/scene.cpp +++ b/nageru/scene.cpp @@ -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); diff --git a/nageru/scene.h b/nageru/scene.h index 4e1181b..4388bbe 100644 --- a/nageru/scene.h +++ b/nageru/scene.h @@ -202,7 +202,7 @@ public: static int add_input(lua_State *L); static int add_effect(lua_State *L); static int add_optional_effect(lua_State *L); - static int add_auto_white_balance(lua_State *L); + static int add_white_balance(lua_State *L); static int finalize(lua_State *L); }; diff --git a/nageru/theme.cpp b/nageru/theme.cpp index d63c853..d04a580 100644 --- a/nageru/theme.cpp +++ b/nageru/theme.cpp @@ -866,7 +866,7 @@ const luaL_Reg Scene_funcs[] = { { "new", Scene_new }, { "__gc", Scene_gc }, { "add_input", Scene::add_input }, - { "add_auto_white_balance", Scene::add_auto_white_balance }, + { "add_white_balance", Scene::add_white_balance }, { "add_effect", Scene::add_effect }, { "add_optional_effect", Scene::add_optional_effect }, { "finalize", Scene::finalize }, diff --git a/nageru/theme.lua b/nageru/theme.lua index 195e89b..b95d1e1 100644 --- a/nageru/theme.lua +++ b/nageru/theme.lua @@ -35,7 +35,7 @@ function make_sbs_input(scene) return { input = scene:add_input(0), -- Live inputs only. resample_effect = scene:add_effect({ResampleEffect.new(), ResizeEffect.new()}), - wb_effect = scene:add_auto_white_balance(), + wb_effect = scene:add_white_balance(), padding_effect = scene:add_effect(IntegralPaddingEffect.new()) } end @@ -67,7 +67,7 @@ function make_fade_input(scene) return { input = scene:add_input(), resample_effect = scene:add_optional_effect(ResampleEffect.new()), -- Activated if scaling. - wb_effect = scene:add_auto_white_balance() -- Activated for video inputs. + wb_effect = scene:add_white_balance() -- Activated for video inputs. } end @@ -95,7 +95,7 @@ local simple_scene = { scene = scene, input = scene:add_input(), resample_effect = scene:add_effect({ResampleEffect.new(), ResizeEffect.new(), IdentityEffect.new()}), - wb_effect = scene:add_auto_white_balance() + wb_effect = scene:add_white_balance() } scene:finalize() -- 2.39.2