Fix auto-WB of certain kinds of input.

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index e3cdac2df54feac52374d623ce36bf34841cabf9..162c3bc5b7f5a90ba3fd54ed047e82abdb0d6daa 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -1685,13 +1685,31 @@ bool Theme::get_supports_set_wb(unsigned channel)
 }
 
 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 };
 
-       if (channel_signals.count(channel)) {
-               white_balance_for_signal[channel_signals[channel]] = WhiteBalance{ 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,
@@ -1711,12 +1729,12 @@ void Theme::set_wb(unsigned channel, float r, float g, float b)
        assert(lua_gettop(L) == 0);
 }
 
-Theme::WhiteBalance Theme::get_white_balance_for_signal(int signal)
+RGBTriplet Theme::get_white_balance_for_signal(int signal)
 {
        if (white_balance_for_signal.count(signal)) {
                return white_balance_for_signal[signal];
        } else {
-               return WhiteBalance{ 1.0, 1.0, 1.0 };
+               return RGBTriplet{ 1.0, 1.0, 1.0 };
        }
 }