Nomenclature cleanups around channels, signals and cards.

[nageru] / nageru / glwidget.cpp

diff --git a/nageru/glwidget.cpp b/nageru/glwidget.cpp
index 10d39cb97c7ff30fb4bdc94bdd3a6493bf63938b..9aae03b05cbb9df60e21134d1e1070dfa9f51d06 100644 (file)
--- a/nageru/glwidget.cpp
+++ b/nageru/glwidget.cpp
@@ -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.
@@ -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.