X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=mainwindow.cpp;h=923c4f9f199c45eabfbf05a50c70772e6013db15;hp=fec26f22fbf19544e4cf9dc921a3a002a696dbe6;hb=54067dbc70999d936adf9d263b5ff2b1efb4dfd0;hpb=21bd3592c1a692463abd321047c2c612f91cc2ad diff --git a/mainwindow.cpp b/mainwindow.cpp index fec26f2..923c4f9 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -19,11 +19,15 @@ #include #include "aboutdialog.h" +#include "disk_space_estimator.h" #include "flags.h" #include "glwidget.h" +#include "input_mapping_dialog.h" #include "lrameter.h" #include "mixer.h" #include "post_to_main_thread.h" +#include "ui_audio_miniview.h" +#include "ui_audio_expanded_view.h" #include "ui_display.h" #include "ui_mainwindow.h" #include "vumeter.h" @@ -51,6 +55,42 @@ void quit_signal(int ignored) global_mainwindow->close(); } +void slave_knob(QDial *master, QDial *slave) +{ + QWidget::connect(master, &QDial::valueChanged, [slave](int value){ + slave->blockSignals(true); + slave->setValue(value); + slave->blockSignals(false); + }); + QWidget::connect(slave, &QDial::valueChanged, [master](int value){ + master->setValue(value); + }); +} + +void slave_checkbox(QCheckBox *master, QCheckBox *slave) +{ + QWidget::connect(master, &QCheckBox::stateChanged, [slave](int state){ + slave->blockSignals(true); + slave->setCheckState(Qt::CheckState(state)); + slave->blockSignals(false); + }); + QWidget::connect(slave, &QCheckBox::stateChanged, [master](int state){ + master->setCheckState(Qt::CheckState(state)); + }); +} + +void slave_fader(NonLinearFader *master, NonLinearFader *slave) +{ + QWidget::connect(master, &NonLinearFader::dbValueChanged, [slave](double value) { + slave->blockSignals(true); + slave->setDbValue(value); + slave->blockSignals(false); + }); + QWidget::connect(slave, &NonLinearFader::dbValueChanged, [master](double value){ + master->setDbValue(value); + }); +} + constexpr unsigned DB_NO_FLAGS = 0x0; constexpr unsigned DB_WITH_SIGN = 0x1; constexpr unsigned DB_BARE = 0x2; @@ -95,6 +135,11 @@ MainWindow::MainWindow() global_mainwindow = this; ui->setupUi(this); + global_disk_space_estimator = new DiskSpaceEstimator(bind(&MainWindow::report_disk_space, this, _1, _2)); + disk_free_label = new QLabel(this); + disk_free_label->setStyleSheet("QLabel {padding-right: 5px;}"); + ui->menuBar->setCornerWidget(disk_free_label); + ui->me_live->set_output(Mixer::OUTPUT_LIVE); ui->me_preview->set_output(Mixer::OUTPUT_PREVIEW); @@ -102,6 +147,7 @@ MainWindow::MainWindow() connect(ui->cut_action, &QAction::triggered, this, &MainWindow::cut_triggered); connect(ui->exit_action, &QAction::triggered, this, &MainWindow::exit_triggered); connect(ui->about_action, &QAction::triggered, this, &MainWindow::about_triggered); + connect(ui->input_mapping_action, &QAction::triggered, this, &MainWindow::input_mapping_triggered); if (global_flags.x264_video_to_http) { connect(ui->x264_bitrate_action, &QAction::triggered, this, &MainWindow::x264_bitrate_triggered); @@ -124,6 +170,12 @@ MainWindow::MainWindow() connect(ui->me_live, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names); qRegisterMetaType("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); } @@ -168,45 +220,70 @@ void MainWindow::mixer_created(Mixer *mixer) connect(ui_display->wb_button, &QPushButton::clicked, bind(&MainWindow::wb_button_clicked, this, i)); } - // TODO: Fetch all of the values these for completeness, - // not just the enable knobs implied by flags. - ui->locut_enabled->setChecked(global_mixer->get_locut_enabled()); - ui->gainstaging_knob->setValue(global_mixer->get_gain_staging_db()); - ui->gainstaging_auto_checkbox->setChecked(global_mixer->get_gain_staging_auto()); - ui->compressor_enabled->setChecked(global_mixer->get_compressor_enabled()); - ui->limiter_enabled->setChecked(global_mixer->get_limiter_enabled()); - ui->makeup_gain_auto_checkbox->setChecked(global_mixer->get_final_makeup_gain_auto()); + setup_audio_miniview(); + setup_audio_expanded_view(); - ui->limiter_threshold_db_display->setText( - QString::fromStdString(format_db(mixer->get_limiter_threshold_dbfs(), DB_WITH_SIGN))); - ui->compressor_threshold_db_display->setText( - QString::fromStdString(format_db(mixer->get_compressor_threshold_dbfs(), DB_WITH_SIGN))); + slave_knob(ui->locut_cutoff_knob, ui->locut_cutoff_knob_2); + slave_knob(ui->limiter_threshold_knob, ui->limiter_threshold_knob_2); + slave_knob(ui->makeup_gain_knob, ui->makeup_gain_knob_2); + slave_checkbox(ui->makeup_gain_auto_checkbox, ui->makeup_gain_auto_checkbox_2); + slave_checkbox(ui->limiter_enabled, ui->limiter_enabled_2); - connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed); - cutoff_knob_changed(ui->locut_cutoff_knob->value()); + // TODO: Fetch all of the values these for completeness, + // not just the enable knobs implied by flags. +#if 0 + // TODO: Reenable for simple audio. + ui->locut_enabled->setChecked(global_mixer->get_audio_mixer()->get_locut_enabled(0)); connect(ui->locut_enabled, &QCheckBox::stateChanged, [this](int state){ - global_mixer->set_locut_enabled(state == Qt::Checked); + global_mixer->get_audio_mixer()->set_locut_enabled(0, state == Qt::Checked); }); - + ui->gainstaging_knob->setValue(global_mixer->get_audio_mixer()->get_gain_staging_db()); + ui->gainstaging_auto_checkbox->setChecked(global_mixer->get_audio_mixer()->get_gain_staging_auto()); + ui->compressor_enabled->setChecked(global_mixer->get_audio_mixer()->get_compressor_enabled()); connect(ui->gainstaging_knob, &QAbstractSlider::valueChanged, this, &MainWindow::gain_staging_knob_changed); connect(ui->gainstaging_auto_checkbox, &QCheckBox::stateChanged, [this](int state){ - global_mixer->set_gain_staging_auto(state == Qt::Checked); + global_mixer->get_audio_mixer()->set_gain_staging_auto(state == Qt::Checked); }); + ui->compressor_threshold_db_display->setText( + QString::fromStdString(format_db(mixer->get_audio_mixer()->get_compressor_threshold_dbfs(), DB_WITH_SIGN))); + ui->compressor_threshold_db_display->setText(buf); + connect(ui->compressor_threshold_knob, &QDial::valueChanged, this, &MainWindow::compressor_threshold_knob_changed); + connect(ui->compressor_enabled, &QCheckBox::stateChanged, [this](int state){ + global_mixer->get_audio_mixer()->set_compressor_enabled(state == Qt::Checked); + }); +#else + ui->locut_enabled->setVisible(false); + ui->gainstaging_label->setVisible(false); + ui->gainstaging_knob->setVisible(false); + ui->gainstaging_db_display->setVisible(false); + ui->gainstaging_auto_checkbox->setVisible(false); + ui->compressor_threshold_label->setVisible(false); + ui->compressor_threshold_knob->setVisible(false); + ui->compressor_threshold_db_display->setVisible(false); + ui->compressor_enabled->setVisible(false); +#endif + ui->limiter_enabled->setChecked(global_mixer->get_audio_mixer()->get_limiter_enabled()); + ui->makeup_gain_auto_checkbox->setChecked(global_mixer->get_audio_mixer()->get_final_makeup_gain_auto()); + + QString limiter_threshold_label( + QString::fromStdString(format_db(mixer->get_audio_mixer()->get_limiter_threshold_dbfs(), DB_WITH_SIGN))); + ui->limiter_threshold_db_display->setText(limiter_threshold_label); + ui->limiter_threshold_db_display_2->setText(limiter_threshold_label); + + connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed); + cutoff_knob_changed(ui->locut_cutoff_knob->value()); + connect(ui->makeup_gain_knob, &QAbstractSlider::valueChanged, this, &MainWindow::final_makeup_gain_knob_changed); connect(ui->makeup_gain_auto_checkbox, &QCheckBox::stateChanged, [this](int state){ - global_mixer->set_final_makeup_gain_auto(state == Qt::Checked); + global_mixer->get_audio_mixer()->set_final_makeup_gain_auto(state == Qt::Checked); }); 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){ - global_mixer->set_limiter_enabled(state == Qt::Checked); - }); - connect(ui->compressor_enabled, &QCheckBox::stateChanged, [this](int state){ - global_mixer->set_compressor_enabled(state == Qt::Checked); + global_mixer->get_audio_mixer()->set_limiter_enabled(state == Qt::Checked); }); connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked); - 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)); struct sigaction act; memset(&act, 0, sizeof(act)); @@ -222,6 +299,98 @@ void MainWindow::mixer_created(Mixer *mixer) sigaction(SIGUSR1, &act, nullptr); } +void MainWindow::setup_audio_miniview() +{ + // Remove any existing channels. + for (QLayoutItem *item; (item = ui->faders->takeAt(0)) != nullptr; ) { + 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; + + // Set up the peak meter. + VUMeter *peak_meter = ui_audio_miniview->peak_meter; + peak_meter->set_min_level(-30.0f); + peak_meter->set_max_level(0.0f); + peak_meter->set_ref_level(0.0f); + + // TODO: Set the fader position. + ui->faders->addWidget(channel); + + connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged, + bind(&MainWindow::mini_fader_changed, this, bus_index, _1)); + } +} + +void MainWindow::setup_audio_expanded_view() +{ + // Remove any existing channels. + for (QLayoutItem *item; (item = ui->buses->takeAt(0)) != nullptr; ) { + delete item->widget(); + delete item; + } + audio_expanded_views.clear(); + + // Set up brand new ones from the input mapping. + InputMapping mapping = global_mixer->get_audio_mixer()->get_input_mapping(); + audio_expanded_views.resize(mapping.buses.size()); + for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) { + QWidget *channel = new QWidget(this); + Ui::AudioExpandedView *ui_audio_expanded_view = new Ui::AudioExpandedView; + ui_audio_expanded_view->setupUi(channel); + ui_audio_expanded_view->bus_desc_label->setFullText( + QString::fromStdString(mapping.buses[bus_index].name)); + audio_expanded_views[bus_index] = ui_audio_expanded_view; + // TODO: Set the fader position. + ui->buses->addWidget(channel); + + ui_audio_expanded_view->locut_enabled->setChecked(global_mixer->get_audio_mixer()->get_locut_enabled(bus_index)); + connect(ui_audio_expanded_view->locut_enabled, &QCheckBox::stateChanged, [this, bus_index](int state){ + global_mixer->get_audio_mixer()->set_locut_enabled(bus_index, state == Qt::Checked); + }); + + ui_audio_expanded_view->gainstaging_knob->setValue(global_mixer->get_audio_mixer()->get_gain_staging_db(bus_index)); + ui_audio_expanded_view->gainstaging_auto_checkbox->setChecked(global_mixer->get_audio_mixer()->get_gain_staging_auto(bus_index)); + ui_audio_expanded_view->compressor_enabled->setChecked(global_mixer->get_audio_mixer()->get_compressor_enabled(bus_index)); + + connect(ui_audio_expanded_view->gainstaging_knob, &QAbstractSlider::valueChanged, bind(&MainWindow::gain_staging_knob_changed, this, bus_index, _1)); + connect(ui_audio_expanded_view->gainstaging_auto_checkbox, &QCheckBox::stateChanged, [this, bus_index](int state){ + global_mixer->get_audio_mixer()->set_gain_staging_auto(bus_index, state == Qt::Checked); + }); + + connect(ui_audio_expanded_view->compressor_threshold_knob, &QDial::valueChanged, bind(&MainWindow::compressor_threshold_knob_changed, this, bus_index, _1)); + connect(ui_audio_expanded_view->compressor_enabled, &QCheckBox::stateChanged, [this, bus_index](int state){ + global_mixer->get_audio_mixer()->set_compressor_enabled(bus_index, state == Qt::Checked); + }); + + slave_fader(audio_miniviews[bus_index]->fader, ui_audio_expanded_view->fader); + + // Set up the peak meter. + VUMeter *peak_meter = ui_audio_expanded_view->peak_meter; + peak_meter->set_min_level(-30.0f); + peak_meter->set_max_level(0.0f); + peak_meter->set_ref_level(0.0f); + + // Set up the compression attenuation meter. + VUMeter *reduction_meter = ui_audio_expanded_view->reduction_meter; + reduction_meter->set_min_level(0.0f); + reduction_meter->set_max_level(10.0f); + reduction_meter->set_ref_level(0.0f); + reduction_meter->set_flip(true); + } +} + void MainWindow::mixer_shutting_down() { ui->me_live->clean_context(); @@ -256,12 +425,25 @@ void MainWindow::about_triggered() AboutDialog().exec(); } -void MainWindow::gain_staging_knob_changed(int value) +void MainWindow::input_mapping_triggered() { - ui->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked); + if (InputMappingDialog().exec() == QDialog::Accepted) { + setup_audio_miniview(); + setup_audio_expanded_view(); + } +} + +void MainWindow::gain_staging_knob_changed(unsigned bus_index, int value) +{ + if (bus_index == 0) { + ui->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked); + } + if (bus_index < audio_expanded_views.size()) { + audio_expanded_views[bus_index]->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked); + } float gain_db = value * 0.1f; - global_mixer->set_gain_staging_db(gain_db); + global_mixer->get_audio_mixer()->set_gain_staging_db(bus_index, gain_db); // The label will be updated by the audio level callback. } @@ -271,7 +453,7 @@ void MainWindow::final_makeup_gain_knob_changed(int value) ui->makeup_gain_auto_checkbox->setCheckState(Qt::Unchecked); float gain_db = value * 0.1f; - global_mixer->set_final_makeup_gain_db(gain_db); + global_mixer->get_audio_mixer()->set_final_makeup_gain_db(gain_db); // The label will be updated by the audio level callback. } @@ -280,45 +462,107 @@ void MainWindow::cutoff_knob_changed(int value) { float octaves = value * 0.1f; float cutoff_hz = 20.0 * pow(2.0, octaves); - global_mixer->set_locut_cutoff(cutoff_hz); + global_mixer->get_audio_mixer()->set_locut_cutoff(cutoff_hz); char buf[256]; snprintf(buf, sizeof(buf), "%ld Hz", lrintf(cutoff_hz)); ui->locut_cutoff_display->setText(buf); + ui->locut_cutoff_display_2->setText(buf); + + for (unsigned bus_index = 0; bus_index < audio_expanded_views.size(); ++bus_index) { + audio_expanded_views[bus_index]->locut_enabled->setText( + QString("Lo-cut: ") + buf); + } +} + +void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_left) +{ + char time_str[256]; + if (estimated_seconds_left < 60.0) { + strcpy(time_str, "Less than a minute"); + } else if (estimated_seconds_left < 1800.0) { // Less than half an hour: Xm Ys (red). + int s = lrintf(estimated_seconds_left); + int m = s / 60; + s %= 60; + snprintf(time_str, sizeof(time_str), "%dm %ds", m, s); + } else if (estimated_seconds_left < 3600.0) { // Less than an hour: Xm. + int m = lrintf(estimated_seconds_left / 60.0); + snprintf(time_str, sizeof(time_str), "%dm", m); + } else if (estimated_seconds_left < 36000.0) { // Less than ten hours: Xh Ym. + int m = lrintf(estimated_seconds_left / 60.0); + int h = m / 60; + m %= 60; + snprintf(time_str, sizeof(time_str), "%dh %dm", h, m); + } else { // More than ten hours: Xh. + int h = lrintf(estimated_seconds_left / 3600.0); + snprintf(time_str, sizeof(time_str), "%dh", h); + } + char buf[256]; + snprintf(buf, sizeof(buf), "Disk free: %'.0f MB (approx. %s)", free_bytes / 1048576.0, time_str); + + std::string label = buf; + + post_to_main_thread([this, label]{ + disk_free_label->setText(QString::fromStdString(label)); + ui->menuBar->setCornerWidget(disk_free_label); // Need to set this again for the sizing to get right. + }); } void MainWindow::limiter_threshold_knob_changed(int value) { float threshold_dbfs = value * 0.1f; - global_mixer->set_limiter_threshold_dbfs(threshold_dbfs); + global_mixer->get_audio_mixer()->set_limiter_threshold_dbfs(threshold_dbfs); ui->limiter_threshold_db_display->setText( QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN))); + ui->limiter_threshold_db_display_2->setText( + QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN))); } -void MainWindow::compressor_threshold_knob_changed(int value) +void MainWindow::compressor_threshold_knob_changed(unsigned bus_index, int value) { float threshold_dbfs = value * 0.1f; - global_mixer->set_compressor_threshold_dbfs(threshold_dbfs); - ui->compressor_threshold_db_display->setText( - QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN))); + global_mixer->get_audio_mixer()->set_compressor_threshold_dbfs(bus_index, threshold_dbfs); + + QString label(QString::fromStdString(format_db(threshold_dbfs, DB_WITH_SIGN))); + if (bus_index == 0) { + ui->compressor_threshold_db_display->setText(label); + } + if (bus_index < audio_expanded_views.size()) { + audio_expanded_views[bus_index]->compressor_threshold_db_display->setText(label); + } +} + +void MainWindow::mini_fader_changed(int bus, double volume_db) +{ + QString label(QString::fromStdString(format_db(volume_db, DB_WITH_SIGN))); + audio_miniviews[bus]->fader_label->setText(label); + audio_expanded_views[bus]->fader_label->setText(label); + + global_mixer->get_audio_mixer()->set_fader_volume(bus, volume_db); } void MainWindow::reset_meters_button_clicked() { - global_mixer->reset_meters(); + global_mixer->get_audio_mixer()->reset_meters(); ui->peak_display->setText(QString::fromStdString(format_db(-HUGE_VAL, DB_WITH_SIGN | DB_BARE))); 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 bus_levels, + float global_level_lufs, float range_low_lufs, float range_high_lufs, - float gain_staging_db, float final_makeup_gain_db, + float final_makeup_gain_db, float correlation) { steady_clock::time_point now = steady_clock::now(); // The meters are somewhat inefficient to update. Only update them - // every 100 ms or so (we get updates every 5–20 ms). + // every 100 ms or so (we get updates every 5–20 ms). Note that this + // means that the digital peak meters are ever so slightly too low + // (each update won't be a faithful representation of the highest peak + // since the previous update, since there are frames we won't draw), + // but the _peak_ of the peak meters will be correct (it's tracked in + // AudioMixer, not here), and that's much more important. double last_update_age = duration(now - last_audio_level_callback).count(); if (last_update_age < 0.100) { return; @@ -327,6 +571,29 @@ 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_levels.size(); ++bus_index) { + if (bus_index < audio_miniviews.size()) { + const AudioMixer::BusLevel &level = bus_levels[bus_index]; + Ui::AudioMiniView *miniview = audio_miniviews[bus_index]; + miniview->peak_meter->set_level( + level.current_level_dbfs[0], level.current_level_dbfs[1]); + miniview->peak_meter->set_peak( + level.peak_level_dbfs[0], level.peak_level_dbfs[1]); + + Ui::AudioExpandedView *view = audio_expanded_views[bus_index]; + view->peak_meter->set_level( + level.current_level_dbfs[0], level.current_level_dbfs[1]); + view->peak_meter->set_peak( + level.peak_level_dbfs[0], level.peak_level_dbfs[1]); + view->reduction_meter->set_level(level.compressor_attenuation_db); + view->gainstaging_knob->blockSignals(true); + view->gainstaging_knob->setValue(lrintf(level.gain_staging_db * 10.0f)); + view->gainstaging_knob->blockSignals(false); + view->gainstaging_db_display->setText( + QString("Gain: ") + + QString::fromStdString(format_db(level.gain_staging_db, DB_WITH_SIGN))); + } + } ui->lra_meter->set_levels(global_level_lufs, range_low_lufs, range_high_lufs); ui->correlation_meter->set_correlation(correlation); @@ -337,17 +604,20 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, float glo ui->peak_display->setStyleSheet(""); } + // NOTE: Will be invisible when using multitrack audio. ui->gainstaging_knob->blockSignals(true); - ui->gainstaging_knob->setValue(lrintf(gain_staging_db * 10.0f)); + ui->gainstaging_knob->setValue(lrintf(bus_levels[0].gain_staging_db * 10.0f)); ui->gainstaging_knob->blockSignals(false); ui->gainstaging_db_display->setText( - QString::fromStdString(format_db(gain_staging_db, DB_WITH_SIGN))); + QString::fromStdString(format_db(bus_levels[0].gain_staging_db, DB_WITH_SIGN))); ui->makeup_gain_knob->blockSignals(true); ui->makeup_gain_knob->setValue(lrintf(final_makeup_gain_db * 10.0f)); ui->makeup_gain_knob->blockSignals(false); ui->makeup_gain_db_display->setText( QString::fromStdString(format_db(final_makeup_gain_db, DB_WITH_SIGN))); + ui->makeup_gain_db_display_2->setText( + QString::fromStdString(format_db(final_makeup_gain_db, DB_WITH_SIGN))); }); } @@ -368,8 +638,13 @@ void MainWindow::relayout() } remaining_height -= me_height + ui->vertical_layout->spacing(); - double audiostrip_height = ui->audiostrip->geometry().height(); - remaining_height -= audiostrip_height + ui->vertical_layout->spacing(); + // 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() + @@ -379,9 +654,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, 0); // Don't stretch the audiostrip. - ui->vertical_layout->setStretch(2, max(1, remaining_height)); // Spacer. - ui->vertical_layout->setStretch(3, 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;