Fix auto-WB of certain kinds of input.

[nageru] / nageru / glwidget.cpp

diff --git a/nageru/glwidget.cpp b/nageru/glwidget.cpp
index bf537de2dbdb0806d2c41fec0b8ebf3fcd74d8e7..d3e1d560d015016a0242c44b234b816e1c79774c 100644 (file)
--- a/nageru/glwidget.cpp
+++ b/nageru/glwidget.cpp
@@ -20,12 +20,12 @@
 #include <utility>
 
 #include "audio_mixer.h"
-#include "context.h"
+#include "shared/context.h"
 #include "context_menus.h"
 #include "flags.h"
 #include "mainwindow.h"
 #include "mixer.h"
-#include "ref_counted_gl_sync.h"
+#include "shared/ref_counted_gl_sync.h"
 
 class QMouseEvent;
 
@@ -72,7 +72,7 @@ void GLWidget::grab_white_balance(unsigned channel, unsigned x, unsigned y)
 {
        // Set the white balance to neutral for the grab. It's probably going to
        // flicker a bit, but hopefully this display is not live anyway.
-       global_mixer->set_wb(output, 0.5, 0.5, 0.5);
+       global_mixer->set_wb(output, 1.0, 1.0, 1.0);
        global_mixer->wait_for_next_frame();
 
        // Mark that the next paintGL() should grab the given pixel.
@@ -96,15 +96,15 @@ void GLWidget::initializeGL()
        global_mixer->add_frame_ready_callback(output, this, [this]{
                QMetaObject::invokeMethod(this, "update", Qt::AutoConnection);
        });
+       global_mixer->set_name_updated_callback(output, [this](const string &name){
+               emit name_updated(output, name);
+       });
        if (output == Mixer::OUTPUT_LIVE) {
                global_mixer->set_transition_names_updated_callback(output, [this](const vector<string> &names){
                        emit transition_names_updated(names);
                });
        }
        if (output >= Mixer::OUTPUT_INPUT0) {
-               global_mixer->set_name_updated_callback(output, [this](const string &name){
-                       emit name_updated(output, name);
-               });
                global_mixer->set_color_updated_callback(output, [this](const string &color){
                        emit color_updated(output, color);
                });