Make it possible to siphon out a single MJPEG stream.

[nageru] / nageru / theme.cpp

diff --git a/nageru/theme.cpp b/nageru/theme.cpp
index f3e1aa1c64bb53cdc913e7f5fdb6d326362ff860..d2a7bba3144f0a4e655ffd6241a926dcb08441f5 100644 (file)
--- a/nageru/theme.cpp
+++ b/nageru/theme.cpp
@@ -52,6 +52,9 @@ using namespace movit;
 
 extern Mixer *global_mixer;
 
+constexpr unsigned Theme::MenuEntry::CHECKABLE;
+constexpr unsigned Theme::MenuEntry::CHECKED;
+
 Theme *get_theme_updata(lua_State* L)
 {
        luaL_checktype(L, lua_upvalueindex(1), LUA_TLIGHTUSERDATA);
@@ -1686,9 +1689,11 @@ 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 (channel_signals.count(channel)) {
-               white_balance_for_signal[channel_signals[channel]] = RGBTriplet{ r, g, b };
+       if (signal != -1) {
+               white_balance_for_signal[signal] = RGBTriplet{ r, g, b };
        }
 
        call_lua_wb_callback(channel, r, g, b);