X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=e0db1b6ac8e16b8f3bc5b90269820a0bdc784430;hb=8db504e0abc3d6b5d64f2fc790c4f751c5e0e778;hp=9ae13fb071a13681998ecb3035752cb46edb09bf;hpb=290811d5f627c6f01e92a09b08cda44cb1cd65b3;p=nageru diff --git a/mainwindow.cpp b/mainwindow.cpp index 9ae13fb..e0db1b6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -22,6 +22,7 @@ #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" @@ -109,6 +110,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); @@ -131,6 +133,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); } @@ -175,60 +183,47 @@ void MainWindow::mixer_created(Mixer *mixer) connect(ui_display->wb_button, &QPushButton::clicked, bind(&MainWindow::wb_button_clicked, this, i)); } - // Audio miniview: Make some channels! - for (unsigned i = 0; i < num_previews; ++i) { - Mixer::Output output = Mixer::Output(Mixer::OUTPUT_INPUT0 + i); - - QWidget *channel = new QWidget(this); - Ui::AudioMiniView *ui_audio_miniview = new Ui::AudioMiniView; - ui_audio_miniview->setupUi(channel); - ui_audio_miniview->channel_desc_label->setFullText( - QString::fromStdString(mixer->get_channel_name(output))); - ui->faders->addWidget(channel); - - connect(ui_audio_miniview->fader, &QAbstractSlider::valueChanged, - bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, i, _1)); - } + setup_audio_miniview(); // 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()); + ui->locut_enabled->setChecked(global_mixer->get_audio_mixer()->get_locut_enabled()); + 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()); + 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()); ui->limiter_threshold_db_display->setText( - QString::fromStdString(format_db(mixer->get_limiter_threshold_dbfs(), DB_WITH_SIGN))); + QString::fromStdString(format_db(mixer->get_audio_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))); + QString::fromStdString(format_db(mixer->get_audio_mixer()->get_compressor_threshold_dbfs(), DB_WITH_SIGN))); connect(ui->locut_cutoff_knob, &QDial::valueChanged, this, &MainWindow::cutoff_knob_changed); cutoff_knob_changed(ui->locut_cutoff_knob->value()); 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(state == Qt::Checked); }); 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); }); 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); + global_mixer->get_audio_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_compressor_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, _9)); struct sigaction act; memset(&act, 0, sizeof(act)); @@ -244,6 +239,33 @@ 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; + // TODO: Set the fader position. + ui->faders->addWidget(channel); + + connect(ui_audio_miniview->fader, &NonLinearFader::dbValueChanged, + bind(&MainWindow::mini_fader_changed, this, ui_audio_miniview, bus_index, _1)); + } +} + void MainWindow::mixer_shutting_down() { ui->me_live->clean_context(); @@ -278,12 +300,19 @@ void MainWindow::about_triggered() AboutDialog().exec(); } +void MainWindow::input_mapping_triggered() +{ + if (InputMappingDialog().exec() == QDialog::Accepted) { + setup_audio_miniview(); + } +} + void MainWindow::gain_staging_knob_changed(int value) { ui->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(gain_db); // The label will be updated by the audio level callback. } @@ -293,7 +322,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. } @@ -302,7 +331,7 @@ 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)); @@ -345,7 +374,7 @@ void MainWindow::report_disk_space(off_t free_bytes, double estimated_seconds_le 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))); } @@ -353,28 +382,33 @@ void MainWindow::limiter_threshold_knob_changed(int value) void MainWindow::compressor_threshold_knob_changed(int value) { float threshold_dbfs = value * 0.1f; - global_mixer->set_compressor_threshold_dbfs(threshold_dbfs); + global_mixer->get_audio_mixer()->set_compressor_threshold_dbfs(threshold_dbfs); ui->compressor_threshold_db_display->setText( 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_dbfs = value * 0.1f; - char buf[256]; - snprintf(buf, sizeof(buf), "%+.1f dB", volume_dbfs); - 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); } 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_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) @@ -391,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); @@ -435,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(); @@ -443,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;