Some typo fixes.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index f656d916b870cb13a8db2dbf223d7b73b2cf2eba..97f9b2cd6ea653c627ae9ba5b92ea5d8a914210b 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -12,7 +12,6 @@
 #include <QPushButton>
 #include <QResizeEvent>
 #include <QShortcut>
-#include <QSignalMapper>
 #include <QSize>
 #include <QString>
 
@@ -42,16 +41,9 @@ MainWindow::MainWindow()
 
        // Hook up the transition buttons.
        // TODO: Make them dynamic.
-       {
-               QSignalMapper *mapper = new QSignalMapper(this);
-               mapper->setMapping(ui->transition_btn1, 0),
-               mapper->setMapping(ui->transition_btn2, 1);
-               mapper->setMapping(ui->transition_btn3, 2);
-               connect(ui->transition_btn1, &QPushButton::clicked, mapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
-               connect(ui->transition_btn2, &QPushButton::clicked, mapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
-               connect(ui->transition_btn3, &QPushButton::clicked, mapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
-               connect(mapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped), this, &MainWindow::transition_clicked);
-       }
+       connect(ui->transition_btn1, &QPushButton::clicked, std::bind(&MainWindow::transition_clicked, this, 0));
+       connect(ui->transition_btn2, &QPushButton::clicked, std::bind(&MainWindow::transition_clicked, this, 1));
+       connect(ui->transition_btn3, &QPushButton::clicked, std::bind(&MainWindow::transition_clicked, this, 2));
 
        // Aiee...
        transition_btn1 = ui->transition_btn1;
@@ -74,7 +66,6 @@ void MainWindow::mixer_created(Mixer *mixer)
 {
        // Make the previews.
        unsigned num_previews = mixer->get_num_channels();
-       QSignalMapper *mapper = new QSignalMapper(this);
 
        for (unsigned i = 0; i < num_previews; ++i) {
                Mixer::Output output = Mixer::Output(Mixer::OUTPUT_INPUT0 + i);
@@ -83,22 +74,21 @@ void MainWindow::mixer_created(Mixer *mixer)
                Ui::Display *ui_display = new Ui::Display;
                ui_display->setupUi(preview);
                ui_display->label->setText(mixer->get_channel_name(output).c_str());
-               ui_display->wb_button->setVisible(mixer->get_supports_set_wb(output));
                ui_display->display->set_output(output);
                ui->preview_displays->insertWidget(previews.size(), preview, 1);
                previews.push_back(ui_display);
 
                // Hook up the click.
-               mapper->setMapping(ui_display->display, i);
-               connect(ui_display->display, &GLWidget::clicked, mapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
+               connect(ui_display->display, &GLWidget::clicked, std::bind(&MainWindow::channel_clicked, this, i));
 
                // Hook up the keyboard key.
                QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_1 + i), this);
-               mapper->setMapping(shortcut, i);
-               connect(shortcut, &QShortcut::activated, mapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
-       }
+               connect(shortcut, &QShortcut::activated, std::bind(&MainWindow::channel_clicked, this, i));
 
-       connect(mapper, static_cast<void (QSignalMapper::*)(int)>(&QSignalMapper::mapped), this, &MainWindow::channel_clicked);
+               // Hook up the white balance button (irrelevant if invisible).
+               ui_display->wb_button->setVisible(mixer->get_supports_set_wb(output));
+               connect(ui_display->wb_button, &QPushButton::clicked, std::bind(&MainWindow::wb_button_clicked, this, i));
+       }
 
        mixer->set_audio_level_callback([this](float level_lufs, float peak_db, float global_level_lufs, float range_low_lufs, float range_high_lufs){
                ui->vu_meter->set_level(level_lufs);
@@ -176,5 +166,62 @@ void MainWindow::transition_clicked(int transition_number)
 
 void MainWindow::channel_clicked(int channel_number)
 {
-       global_mixer->channel_clicked(channel_number);
+       if (current_wb_pick_display == channel_number) {
+               // The picking was already done from eventFilter(), since we don't get
+               // the mouse pointer here.
+       } else {
+               global_mixer->channel_clicked(channel_number);
+       }
+}
+
+void MainWindow::wb_button_clicked(int channel_number)
+{
+       current_wb_pick_display = channel_number;
+       QApplication::setOverrideCursor(Qt::CrossCursor);
+}
+
+bool MainWindow::eventFilter(QObject *watched, QEvent *event)
+{
+       if (current_wb_pick_display != -1 &&
+           event->type() == QEvent::MouseButtonRelease &&
+           watched->isWidgetType()) {
+               QApplication::restoreOverrideCursor();
+               if (watched == previews[current_wb_pick_display]->display) {
+                       const QMouseEvent *mouse_event = (QMouseEvent *)event;
+                       set_white_balance(current_wb_pick_display, mouse_event->x(), mouse_event->y());
+               } else {
+                       // The user clicked on something else, give up.
+                       // (The click goes through, which might not be ideal, but, yes.)
+                       current_wb_pick_display = -1;
+               }
+       }
+       return false;
+}
+
+namespace {
+
+double srgb_to_linear(double x)
+{
+       if (x < 0.04045) {
+               return x / 12.92;
+       } else {
+               return pow((x + 0.055) / 1.055, 2.4);
+       }
+}
+
+}  // namespace
+
+void MainWindow::set_white_balance(int channel_number, int x, int 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(Mixer::OUTPUT_INPUT0 + channel_number, 0.5, 0.5, 0.5);
+       previews[channel_number]->display->updateGL();
+       QRgb reference_color = previews[channel_number]->display->grabFrameBuffer().pixel(x, y);
+
+       double r = srgb_to_linear(qRed(reference_color) / 255.0);
+       double g = srgb_to_linear(qGreen(reference_color) / 255.0);
+       double b = srgb_to_linear(qBlue(reference_color) / 255.0);
+       global_mixer->set_wb(Mixer::OUTPUT_INPUT0 + channel_number, r, g, b);
+       previews[channel_number]->display->updateGL();
 }