X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=4b8eb51482543b01549a36d02a19c286f14abcc4;hb=b85c1986b7ea63534899e2eb589f9e0888d5ccda;hp=cfc15699261b04ef3b9edb9847fd3b1780279e39;hpb=63bf80f2f51d64a412df94199b1f66b4db1d404c;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index cfc1569..4b8eb51 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 #include <QBoxLayout>
+#include <QInputDialog>
 #include <QKeySequence>
 #include <QLabel>
 #include <QMetaType>
@@ -17,6 +18,7 @@
 #include <QString>
 
 #include "aboutdialog.h"
+#include "flags.h"
 #include "glwidget.h"
 #include "lrameter.h"
 #include "mixer.h"
@@ -61,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.
@@ -120,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);
@@ -132,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);
 	});
@@ -181,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();
@@ -280,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);
 	});