X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.cpp;h=162c3bc5b7f5a90ba3fd54ed047e82abdb0d6daa;hb=f9024d141398e69e7b4011becd3ebbe37eaa1776;hp=78b0fde35cd2b075e2482f921776da71ade955f9;hpb=1924bea4fde26067d8ee81cfd12f2dd66c5b2cad;p=nageru

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index 78b0fde..162c3bc 100644
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -116,6 +116,7 @@ Effect *instantiate_effect(EffectChain *chain, EffectType effect_type)
 	case IDENTITY_EFFECT:
 		return new IdentityEffect;
 	case WHITE_BALANCE_EFFECT:
+	case AUTO_WHITE_BALANCE_EFFECT:
 		return new WhiteBalanceEffect;
 	case RESAMPLE_EFFECT:
 		return new ResampleEffect;
@@ -860,6 +861,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_effect", Scene::add_effect },
 	{ "add_optional_effect", Scene::add_optional_effect },
 	{ "finalize", Scene::finalize },
@@ -1682,10 +1684,39 @@ bool Theme::get_supports_set_wb(unsigned channel)
 	return ret;
 }
 
-void Theme::set_wb(unsigned channel, double r, double g, double b)
+void Theme::set_wb(unsigned channel, float r, float g, float b)
 {
+	int signal = get_channel_signal(channel);
+
 	lock_guard<mutex> lock(m);
+	if (signal != -1) {
+		white_balance_for_signal[signal] = RGBTriplet{ r, g, b };
+	}
+
+	call_lua_wb_callback(channel, r, g, b);
+}
+
+void Theme::set_wb_for_signal(int signal, float r, float g, float b)
+{
+	lock_guard<mutex> lock(m);
+	white_balance_for_signal[signal] = RGBTriplet{ r, g, b };
+
+	for (const auto &channel_and_signal : channel_signals) {
+		if (channel_and_signal.second == signal) {
+			call_lua_wb_callback(channel_and_signal.first, r, g, b);
+		}
+	}
+}
+
+void Theme::call_lua_wb_callback(unsigned channel, float r, float g, float b)
+{
 	lua_getglobal(L, "set_wb");
+	if (lua_isnil(L, -1)) {
+		// The function doesn't exist, to just ignore. We've stored the white balance,
+		// and most likely, it will be picked up by auto white balance instead.
+		lua_pop(L, 1);
+		return;
+	}
 	lua_pushnumber(L, channel);
 	lua_pushnumber(L, r);
 	lua_pushnumber(L, g);
@@ -1698,6 +1729,15 @@ void Theme::set_wb(unsigned channel, double r, double g, double b)
 	assert(lua_gettop(L) == 0);
 }
 
+RGBTriplet Theme::get_white_balance_for_signal(int signal)
+{
+	if (white_balance_for_signal.count(signal)) {
+		return white_balance_for_signal[signal];
+	} else {
+		return RGBTriplet{ 1.0, 1.0, 1.0 };
+	}
+}
+
 vector<string> Theme::get_transition_names(float t)
 {
 	lock_guard<mutex> lock(m);