Make current_IDR_display non-global.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 34db733bababc8b0e4f63b1233432fe2aab377e6..f15e56ae008e5c5058e7f39807d21f05cf073670 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -51,8 +51,9 @@ MainWindow::MainWindow()
        transition_btn1 = ui->transition_btn1;
        transition_btn2 = ui->transition_btn2;
        transition_btn3 = ui->transition_btn3;
-       qRegisterMetaType<std::vector<std::string>>("std::vector<std::string>");
+       qRegisterMetaType<vector<string>>("std::vector<std::string>");
        connect(ui->me_preview, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
+       qRegisterMetaType<Mixer::Output>("Mixer::Output");
 }
 
 void MainWindow::resizeEvent(QResizeEvent* event)
@@ -83,6 +84,9 @@ void MainWindow::mixer_created(Mixer *mixer)
                // Hook up the click.
                connect(ui_display->display, &GLWidget::clicked, bind(&MainWindow::channel_clicked, this, i));
 
+               // Let the theme update the text whenever the resolution changed.
+               connect(ui_display->display, &GLWidget::resolution_updated, this, &MainWindow::update_channel_name);
+
                // Hook up the keyboard key.
                QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_1 + i), this);
                connect(shortcut, &QShortcut::activated, bind(&MainWindow::channel_clicked, this, i));
@@ -99,6 +103,8 @@ void MainWindow::mixer_created(Mixer *mixer)
        ui->compressor_threshold_db_display->setText(buf);
 
        connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed);
+       cutoff_knob_changed(ui->locut_cutoff_knob->value());
+
        connect(ui->limiter_threshold_knob, &QDial::valueChanged, this, &MainWindow::limiter_threshold_knob_changed);
        connect(ui->compressor_threshold_knob, &QDial::valueChanged, this, &MainWindow::compressor_threshold_knob_changed);
        connect(ui->limiter_enabled, &QCheckBox::stateChanged, [this](int state){
@@ -111,6 +117,15 @@ void MainWindow::mixer_created(Mixer *mixer)
        mixer->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6));
 }
 
+void MainWindow::mixer_shutting_down()
+{
+       ui->me_live->clean_context();
+       ui->me_preview->clean_context();
+       for (Ui::Display *display : previews) {
+               display->display->clean_context();
+       }
+}
+
 void MainWindow::cutoff_knob_changed(int value)
 {
        float octaves = value * 0.1f;
@@ -205,12 +220,12 @@ void MainWindow::relayout()
        // The previews will be constrained by the remaining height, and the width.
        double preview_label_height = previews[0]->title_bar->geometry().height() + ui->preview_displays->spacing();  // Wrong spacing?
        int preview_total_width = ui->preview_displays->geometry().width();
-       double preview_height = std::min(remaining_height - preview_label_height, (preview_total_width / double(previews.size())) * 9.0 / 16.0);
+       double preview_height = min(remaining_height - preview_label_height, (preview_total_width / double(previews.size())) * 9.0 / 16.0);
        remaining_height -= preview_height + preview_label_height + ui->vertical_layout->spacing();
 
        ui->vertical_layout->setStretch(0, lrintf(me_height));
        ui->vertical_layout->setStretch(1, 0);  // Don't stretch the audiostrip.
-       ui->vertical_layout->setStretch(2, std::max<int>(1, remaining_height));  // Spacer.
+       ui->vertical_layout->setStretch(2, max<int>(1, remaining_height));  // Spacer.
        ui->vertical_layout->setStretch(3, lrintf(preview_height + preview_label_height));
 
        // Set the widths for the previews.
@@ -245,6 +260,14 @@ void MainWindow::set_transition_names(vector<string> transition_names)
        }
 }
 
+void MainWindow::update_channel_name(Mixer::Output output)
+{
+       if (output >= Mixer::OUTPUT_INPUT0) {
+               unsigned channel = output - Mixer::OUTPUT_INPUT0;
+               previews[channel]->label->setText(global_mixer->get_channel_name(output).c_str());
+       }
+}
+
 void MainWindow::transition_clicked(int transition_number)
 {
        global_mixer->transition_clicked(transition_number);