X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=4b8eb51482543b01549a36d02a19c286f14abcc4;hb=b85c1986b7ea63534899e2eb589f9e0888d5ccda;hp=5adae5cd92742b32e9c0533e9f643e3f0b3a69d3;hpb=8e709b0411645fca8b66035ee6db1eba68039b13;p=nageru diff --git a/mainwindow.cpp b/mainwindow.cpp index 5adae5c..4b8eb51 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -17,6 +18,7 @@ #include #include "aboutdialog.h" +#include "flags.h" #include "glwidget.h" #include "lrameter.h" #include "mixer.h" @@ -30,8 +32,11 @@ class QResizeEvent; using namespace std; using namespace std::placeholders; +Q_DECLARE_METATYPE(std::string); Q_DECLARE_METATYPE(std::vector); +MainWindow *global_mainwindow = nullptr; + namespace { void schedule_cut_signal(int ignored) @@ -41,13 +46,11 @@ void schedule_cut_signal(int ignored) void quit_signal(int ignored) { - global_mixer->quit(); + global_mainwindow->close(); } } // namespace -MainWindow *global_mainwindow = nullptr; - MainWindow::MainWindow() : ui(new Ui::MainWindow) { @@ -60,7 +63,13 @@ MainWindow::MainWindow() // The menus. 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->about_action, &QAction::triggered, this, &MainWindow::about_triggered); + + if (global_flags.x264_video_to_http) { + connect(ui->x264_bitrate_action, &QAction::triggered, this, &MainWindow::x264_bitrate_triggered); + } else { + ui->x264_bitrate_action->setEnabled(false); + } // Hook up the transition buttons. (Keyboard shortcuts are set in set_transition_names().) // TODO: Make them dynamic. @@ -72,8 +81,9 @@ MainWindow::MainWindow() transition_btn1 = ui->transition_btn1; transition_btn2 = ui->transition_btn2; transition_btn3 = ui->transition_btn3; + qRegisterMetaType("std::string"); qRegisterMetaType>("std::vector"); - connect(ui->me_preview, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names); + connect(ui->me_live, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names); qRegisterMetaType("Mixer::Output"); } @@ -106,7 +116,7 @@ void MainWindow::mixer_created(Mixer *mixer) connect(ui_display->display, &GLWidget::clicked, bind(&MainWindow::channel_clicked, this, i)); // Let the theme update the text whenever the resolution or color changed. - connect(ui_display->display, &GLWidget::resolution_updated, this, &MainWindow::update_channel_name); + connect(ui_display->display, &GLWidget::name_updated, this, &MainWindow::update_channel_name); connect(ui_display->display, &GLWidget::color_updated, this, &MainWindow::update_channel_color); // Hook up the keyboard key. @@ -118,6 +128,13 @@ 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 --flat-audio. + ui->locut_enabled->setChecked(global_mixer->get_locut_enabled()); + ui->gainstaging_auto_checkbox->setChecked(global_mixer->get_gain_staging_auto()); + ui->limiter_enabled->setChecked(global_mixer->get_limiter_enabled()); + ui->compressor_enabled->setChecked(global_mixer->get_compressor_enabled()); + char buf[256]; snprintf(buf, sizeof(buf), "%.1f dB", mixer->get_limiter_threshold_dbfs()); ui->limiter_threshold_db_display->setText(buf); @@ -130,12 +147,11 @@ void MainWindow::mixer_created(Mixer *mixer) global_mixer->set_locut_enabled(state == Qt::Checked); }); - // Not QDial::valueChanged, as we call setValue() all the time. - connect(ui->gainstaging_knob, &QAbstractSlider::sliderMoved, this, &MainWindow::gain_staging_knob_changed); + 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); }); - connect(ui->makeup_gain_knob, &QAbstractSlider::sliderMoved, this, &MainWindow::final_makeup_gain_knob_changed); + 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); }); @@ -152,12 +168,14 @@ void MainWindow::mixer_created(Mixer *mixer) 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)); act.sa_handler = schedule_cut_signal; act.sa_flags = SA_RESTART; sigaction(SIGHUP, &act, nullptr); // Mostly for debugging. Don't override SIGINT, that's so evil if // shutdown isn't instant. + memset(&act, 0, sizeof(act)); act.sa_handler = quit_signal; act.sa_flags = SA_RESTART; sigaction(SIGUSR1, &act, nullptr); @@ -177,6 +195,16 @@ void MainWindow::cut_triggered() global_mixer->schedule_cut(); } +void MainWindow::x264_bitrate_triggered() +{ + bool ok; + int new_bitrate = QInputDialog::getInt(this, "Change x264 bitrate", "Choose new bitrate for x264 HTTP output (from 100–100,000 kbit/sec):", global_flags.x264_bitrate, /*min=*/100, /*max=*/100000, /*step=*/100, &ok); + if (ok && new_bitrate >= 100 && new_bitrate <= 100000) { + global_flags.x264_bitrate = new_bitrate; + global_mixer->change_x264_bitrate(new_bitrate); + } +} + void MainWindow::exit_triggered() { close(); @@ -276,11 +304,15 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, float glo ui->peak_display->setStyleSheet(""); } + ui->gainstaging_knob->blockSignals(true); ui->gainstaging_knob->setValue(lrintf(gain_staging_db * 10.0f)); + ui->gainstaging_knob->blockSignals(false); snprintf(buf, sizeof(buf), "%+.1f dB", gain_staging_db); ui->gainstaging_db_display->setText(buf); + ui->makeup_gain_knob->blockSignals(true); ui->makeup_gain_knob->setValue(lrintf(final_makeup_gain_db * 10.0f)); + ui->makeup_gain_knob->blockSignals(false); snprintf(buf, sizeof(buf), "%+.1f dB", final_makeup_gain_db); ui->makeup_gain_db_display->setText(buf); }); @@ -351,19 +383,18 @@ void MainWindow::set_transition_names(vector transition_names) } } -void MainWindow::update_channel_name(Mixer::Output output) +void MainWindow::update_channel_name(Mixer::Output output, const string &name) { if (output >= Mixer::OUTPUT_INPUT0) { unsigned channel = output - Mixer::OUTPUT_INPUT0; - previews[channel]->label->setText(global_mixer->get_channel_name(output).c_str()); + previews[channel]->label->setText(name.c_str()); } } -void MainWindow::update_channel_color(Mixer::Output output) +void MainWindow::update_channel_color(Mixer::Output output, const string &color) { if (output >= Mixer::OUTPUT_INPUT0) { unsigned channel = output - Mixer::OUTPUT_INPUT0; - string color = global_mixer->get_channel_color(output); previews[channel]->frame->setStyleSheet(QString::fromStdString("background-color:" + color)); } }