Add some pagination to the main window.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 28f0393fce2c4a20e1ef50a180cb8314cc57a1ae..e0db1b6ac8e16b8f3bc5b90269820a0bdc784430 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -133,6 +133,12 @@ MainWindow::MainWindow()
        connect(ui->me_live, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
        qRegisterMetaType<Mixer::Output>("Mixer::Output");
 
+       // Hook up the prev/next buttons on the audio views.
+       connect(ui->compact_prev_page, &QAbstractButton::clicked, bind(&QStackedWidget::setCurrentIndex, ui->audio_views, 1));
+       connect(ui->compact_next_page, &QAbstractButton::clicked, bind(&QStackedWidget::setCurrentIndex, ui->audio_views, 1));
+       connect(ui->full_prev_page, &QAbstractButton::clicked, bind(&QStackedWidget::setCurrentIndex, ui->audio_views, 0));
+       connect(ui->full_next_page, &QAbstractButton::clicked, bind(&QStackedWidget::setCurrentIndex, ui->audio_views, 0));
+
        last_audio_level_callback = steady_clock::now() - seconds(1);
 }
 
@@ -217,7 +223,7 @@ void MainWindow::mixer_created(Mixer *mixer)
                global_mixer->get_audio_mixer()->set_compressor_enabled(state == Qt::Checked);
        });
        connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked);
-       mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
+       mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8, _9));
 
        struct sigaction act;
        memset(&act, 0, sizeof(act));
@@ -240,19 +246,22 @@ void MainWindow::setup_audio_miniview()
                delete item->widget();
                delete item;
        }
+       audio_miniviews.clear();
 
        // Set up brand new ones from the input mapping.
        InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping();
+       audio_miniviews.resize(mapping.buses.size());
        for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) {
                QWidget *channel = new QWidget(this);
                Ui::AudioMiniView *ui_audio_miniview = new Ui::AudioMiniView;
                ui_audio_miniview->setupUi(channel);
                ui_audio_miniview->bus_desc_label->setFullText(
                        QString::fromStdString(mapping.buses[bus_index].name));
+               audio_miniviews[bus_index] = ui_audio_miniview;
                // TODO: Set the fader position.
                ui->faders->addWidget(channel);
 
-               connect(ui_audio_miniview->fader, &QAbstractSlider::valueChanged,
+               connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged,
                        bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, bus_index, _1));
        }
 }
@@ -378,13 +387,15 @@ void MainWindow::compressor_threshold_knob_changed(int value)
                QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN)));
 }
 
-void MainWindow::mini_fader_changed(Ui::AudioMiniView *ui, int channel, int value)
+void MainWindow::mini_fader_changed(Ui::AudioMiniView *ui, int channel, double volume_db)
 {
-       float volume_db = value * 0.1f;
-
        char buf[256];
-       snprintf(buf, sizeof(buf), "%+.1f dB", volume_db);
-       ui->fader_label->setText(buf);
+       if (isfinite(volume_db)) {
+               snprintf(buf, sizeof(buf), "%+.1f dB", volume_db);
+               ui->fader_label->setText(buf);
+       } else {
+               ui->fader_label->setText("-∞ dB");
+       }
 
        global_mixer->get_audio_mixer()->set_fader_volume(channel, volume_db);
 }
@@ -396,7 +407,8 @@ void MainWindow::reset_meters_button_clicked()
        ui->peak_display->setStyleSheet("");
 }
 
-void MainWindow::audio_level_callback(float level_lufs, float peak_db, float global_level_lufs,
+void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<float> bus_level_lufs,
+                                      float global_level_lufs,
                                       float range_low_lufs, float range_high_lufs,
                                       float gain_staging_db, float final_makeup_gain_db,
                                       float correlation)
@@ -413,6 +425,12 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, float glo
 
        post_to_main_thread([=]() {
                ui->vu_meter->set_level(level_lufs);
+               for (unsigned bus_index = 0; bus_index < bus_level_lufs.size(); ++bus_index) {
+                       if (bus_index < audio_miniviews.size()) {
+                               audio_miniviews[bus_index]->vu_meter_meter->set_level(
+                                       bus_level_lufs[bus_index]);
+                       }
+               }
                ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs);
                ui->correlation_meter->set_correlation(correlation);
 
@@ -457,6 +475,11 @@ void MainWindow::relayout()
        // Space between the M/E displays and the audio strip.
        remaining_height -= ui->vertical_layout->spacing();
 
+       // The label above the audio strip.
+       double compact_label_height = ui->compact_label->geometry().height() +
+               ui->compact_audio_layout->spacing();
+       remaining_height -= compact_label_height;
+
        // The previews will be constrained by the remaining height, and the width.
        double preview_label_height = previews[0]->title_bar->geometry().height() +
                previews[0]->main_vertical_layout->spacing();
@@ -465,8 +488,14 @@ void MainWindow::relayout()
        remaining_height -= preview_height + preview_label_height + ui->vertical_layout->spacing();
 
        ui->vertical_layout->setStretch(0, lrintf(me_height));
-       ui->vertical_layout->setStretch(1, lrintf(remaining_height));  // Audio strip.
-       ui->vertical_layout->setStretch(2, lrintf(preview_height + preview_label_height));
+       ui->vertical_layout->setStretch(1,
+               lrintf(compact_label_height) +
+               lrintf(remaining_height) +
+               lrintf(preview_height + preview_label_height));  // Audio strip and previews together.
+
+       ui->compact_audio_layout->setStretch(0, lrintf(compact_label_height));
+       ui->compact_audio_layout->setStretch(1, lrintf(remaining_height));  // Audio strip.
+       ui->compact_audio_layout->setStretch(2, lrintf(preview_height + preview_label_height));
 
        // Set the widths for the previews.
        double preview_width = preview_height * 16.0 / 9.0;