X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=23d76ab8a16c0bd101e9d1ee4393525142194efa;hb=c19209ad2d9f862ae634fefb4b7bb2e30bfc3dc1;hp=841952f8b28eda6b2c83483aedf717e00ef6c834;hpb=b561d43a60201395f1354a585aa37670eda45883;p=nageru diff --git a/mainwindow.cpp b/mainwindow.cpp index 841952f..23d76ab 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -22,9 +22,11 @@ #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_display.h" #include "ui_mainwindow.h" #include "vumeter.h" @@ -108,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); @@ -174,42 +177,57 @@ 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)); + } + // 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)); @@ -262,12 +280,17 @@ void MainWindow::about_triggered() AboutDialog().exec(); } +void MainWindow::input_mapping_triggered() +{ + InputMappingDialog().exec(); +} + 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. } @@ -277,7 +300,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. } @@ -286,7 +309,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)); @@ -329,7 +352,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))); } @@ -337,11 +360,22 @@ 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) +{ + float volume_db = value * 0.1f; + + char buf[256]; + snprintf(buf, sizeof(buf), "%+.1f dB", volume_db); + ui->fader_label->setText(buf); + + global_mixer->get_audio_mixer()->set_fader_volume(channel, volume_db); +} + void MainWindow::reset_meters_button_clicked() { global_mixer->reset_meters(); @@ -407,8 +441,8 @@ 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 previews will be constrained by the remaining height, and the width. double preview_label_height = previews[0]->title_bar->geometry().height() + @@ -418,9 +452,8 @@ 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(remaining_height)); // Audio strip. + ui->vertical_layout->setStretch(2, lrintf(preview_height + preview_label_height)); // Set the widths for the previews. double preview_width = preview_height * 16.0 / 9.0;