X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=e23d191d978511589e1e3ab8ec146232812a8d81;hb=0fff2c95c89541e5b23611962a00886c64c00daa;hp=ede1fb6827de668b0264fedc8953eec3be05a429;hpb=d62349fd118e89b16adfc5478c73cd8e10136364;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ede1fb6..e23d191 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -41,6 +41,9 @@ MainWindow::MainWindow()
 	ui->me_live->set_output(Mixer::OUTPUT_LIVE);
 	ui->me_preview->set_output(Mixer::OUTPUT_PREVIEW);
 
+	// The menu.
+	connect(ui->cut_action, &QAction::triggered, this, &MainWindow::cut_triggered);
+
 	// Hook up the transition buttons.
 	// TODO: Make them dynamic.
 	connect(ui->transition_btn1, &QPushButton::clicked, bind(&MainWindow::transition_clicked, this, 0));
@@ -51,7 +54,7 @@ MainWindow::MainWindow()
 	transition_btn1 = ui->transition_btn1;
 	transition_btn2 = ui->transition_btn2;
 	transition_btn3 = ui->transition_btn3;
-	qRegisterMetaType<std::vector<std::string>>("std::vector<std::string>");
+	qRegisterMetaType<vector<string>>("std::vector<std::string>");
 	connect(ui->me_preview, &GLWidget::transition_names_updated, this, &MainWindow::set_transition_names);
 	qRegisterMetaType<Mixer::Output>("Mixer::Output");
 }
@@ -126,6 +129,11 @@ void MainWindow::mixer_shutting_down()
 	}
 }
 
+void MainWindow::cut_triggered()
+{
+	global_mixer->schedule_cut();
+}
+
 void MainWindow::cutoff_knob_changed(int value)
 {
 	float octaves = value * 0.1f;
@@ -220,12 +228,12 @@ void MainWindow::relayout()
 	// The previews will be constrained by the remaining height, and the width.
 	double preview_label_height = previews[0]->title_bar->geometry().height() + ui->preview_displays->spacing();  // Wrong spacing?
 	int preview_total_width = ui->preview_displays->geometry().width();
-	double preview_height = std::min(remaining_height - preview_label_height, (preview_total_width / double(previews.size())) * 9.0 / 16.0);
+	double preview_height = min(remaining_height - preview_label_height, (preview_total_width / double(previews.size())) * 9.0 / 16.0);
 	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, std::max<int>(1, remaining_height));  // Spacer.
+	ui->vertical_layout->setStretch(2, max<int>(1, remaining_height));  // Spacer.
 	ui->vertical_layout->setStretch(3, lrintf(preview_height + preview_label_height));
 
 	// Set the widths for the previews.