X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=d46c87c38e7766b667230057482814f8879646ca;hb=d8562cbe45e19870d4b4ce75f89abcd6a07802aa;hp=b1071fef4ed005adf24e84bdf4f21ead2de1307e;hpb=29fc190374dddd2569e6863fb480669a7af72e44;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index b1071fe..d46c87c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -253,6 +253,13 @@ MainWindow::MainWindow()
 	connect(new QShortcut(QKeySequence::MoveToNextPage, this), &QShortcut::activated, switch_page);
 	connect(new QShortcut(QKeySequence::MoveToPreviousPage, this), &QShortcut::activated, switch_page);
 
+	if (global_flags.enable_quick_cut_keys) {
+		ui->quick_cut_enable_action->setChecked(true);
+	}
+	connect(ui->quick_cut_enable_action, &QAction::changed, [this](){
+		global_flags.enable_quick_cut_keys = ui->quick_cut_enable_action->isChecked();
+	});
+
 	last_audio_level_callback = steady_clock::now() - seconds(1);
 
 	if (!global_flags.midi_mapping_filename.empty()) {
@@ -282,6 +289,7 @@ void MainWindow::mixer_created(Mixer *mixer)
 	// Make the previews.
 	unsigned num_previews = mixer->get_num_channels();
 
+	const char qwerty[] = "QWERTYUIOP";
 	for (unsigned i = 0; i < num_previews; ++i) {
 		Mixer::Output output = Mixer::Output(Mixer::OUTPUT_INPUT0 + i);
 
@@ -304,6 +312,12 @@ void MainWindow::mixer_created(Mixer *mixer)
 		QShortcut *shortcut = new QShortcut(QKeySequence(Qt::Key_1 + i), this);
 		connect(shortcut, &QShortcut::activated, bind(&MainWindow::channel_clicked, this, i));
 
+		// Hook up the quick-cut key.
+		if (i < strlen(qwerty)) {
+			QShortcut *shortcut = new QShortcut(QKeySequence(qwerty[i]), this);
+			connect(shortcut, &QShortcut::activated, bind(&MainWindow::quick_cut_activated, this, i));
+		}
+
 		// Hook up the white balance button (irrelevant if invisible).
 		ui_display->wb_button->setVisible(mixer->get_supports_set_wb(output));
 		connect(ui_display->wb_button, &QPushButton::clicked, bind(&MainWindow::wb_button_clicked, this, i));
@@ -382,6 +396,8 @@ void MainWindow::mixer_created(Mixer *mixer)
 	midi_mapper.refresh_lights();
 	midi_mapper.start_thread();
 
+	analyzer.reset(new Analyzer);
+
 	struct sigaction act;
 	memset(&act, 0, sizeof(act));
 	act.sa_handler = schedule_cut_signal;
@@ -497,7 +513,7 @@ void MainWindow::setup_audio_expanded_view()
 		update_eq_label(bus_index, EQ_BAND_MID, global_audio_mixer->get_eq(bus_index, EQ_BAND_MID));
 		update_eq_label(bus_index, EQ_BAND_BASS, global_audio_mixer->get_eq(bus_index, EQ_BAND_BASS));
 		ui_audio_expanded_view->fader->setDbValue(global_audio_mixer->get_fader_volume(bus_index));
-		ui_audio_expanded_view->mute_button->setChecked(global_audio_mixer->get_mute(bus_index) ? Qt::Checked : Qt::Unchecked);
+		ui_audio_expanded_view->mute_button->setChecked(global_audio_mixer->get_mute(bus_index));
 		connect(ui_audio_expanded_view->mute_button, &QPushButton::toggled,
 			bind(&MainWindow::mute_button_toggled, this, bus_index, _1));
 		ui->buses->addWidget(channel);
@@ -558,7 +574,7 @@ void MainWindow::mixer_shutting_down()
 		display->display->shutdown();
 	}
 
-	analyzer.reset();
+	analyzer->mixer_shutting_down();
 }
 
 void MainWindow::cut_triggered()
@@ -597,7 +613,6 @@ void MainWindow::about_triggered()
 
 void MainWindow::open_analyzer_triggered()
 {
-	analyzer.reset(new Analyzer);
 	analyzer->show();
 }
 
@@ -1253,6 +1268,8 @@ void MainWindow::update_channel_name(Mixer::Output output, const string &name)
 		unsigned channel = output - Mixer::OUTPUT_INPUT0;
 		previews[channel]->label->setText(name.c_str());
 	}
+
+	analyzer->update_channel_name(output, name);
 }
 
 void MainWindow::update_channel_color(Mixer::Output output, const string &color)
@@ -1278,6 +1295,15 @@ void MainWindow::channel_clicked(int channel_number)
 	}
 }
 
+void MainWindow::quick_cut_activated(int channel_number)
+{
+	if (!global_flags.enable_quick_cut_keys) {
+		return;
+	}
+	global_mixer->channel_clicked(channel_number);
+	global_mixer->transition_clicked(0);
+}
+
 void MainWindow::wb_button_clicked(int channel_number)
 {
 	current_wb_pick_display = channel_number;
@@ -1302,6 +1328,12 @@ bool MainWindow::eventFilter(QObject *watched, QEvent *event)
 	return false;
 }
 
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+	analyzer->hide();
+	event->accept();
+}
+
 namespace {
 
 double srgb_to_linear(double x)