Nomenclature cleanups around channels, signals and cards.

[nageru] / nageru / glwidget.cpp

diff --git a/nageru/glwidget.cpp b/nageru/glwidget.cpp
index bf537de2dbdb0806d2c41fec0b8ebf3fcd74d8e7..9aae03b05cbb9df60e21134d1e1070dfa9f51d06 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);
                });
@@ -174,7 +174,7 @@ void GLWidget::show_context_menu(const QPoint &pos)
                show_live_context_menu(pos);
        }
        if (output >= Mixer::OUTPUT_INPUT0) {
-               int signal_num = global_mixer->get_channel_signal(output);
+               int signal_num = global_mixer->map_channel_to_signal(output);
                if (signal_num != -1) {
                        show_preview_context_menu(signal_num, pos);
                }
@@ -228,7 +228,7 @@ void GLWidget::show_preview_context_menu(unsigned signal_num, const QPoint &pos)
        QActionGroup mode_group(&mode_submenu);
 
        unsigned num_cards = global_mixer->get_num_cards();
-       unsigned current_card = global_mixer->map_signal(signal_num);
+       unsigned current_card = global_mixer->map_signal_to_card(signal_num);
        bool is_ffmpeg = global_mixer->card_is_ffmpeg(current_card);
 
        if (!is_ffmpeg) {  // FFmpeg inputs are not connected to any card; they're locked to a given input and have a given Y'CbCr interpretatio and have a given Y'CbCr interpretationn.