X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=6c250187cde4f73f6b96cb50cdf8e231a607e26d;hb=6da5e74d3e13c307de29bd540ff4ce8371000efd;hp=11419c75b7c6dcc7c27b5110326cae09895ca6ac;hpb=fcae09355c1a00a68015b3d727339aebd2e52aa4;p=nageru

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 11419c7..6c25018 100644
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -203,6 +203,12 @@ MainWindow::MainWindow()
 	playlist_selection_changed();  // First time set-up.
 
 	preview_player.reset(new Player(ui->preview_display, Player::NO_STREAM_OUTPUT));
+	preview_player->set_done_callback([this] {
+		post_to_main_thread([this] {
+			preview_player_done();
+		});
+	});
+
 	live_player.reset(new Player(ui->live_display, Player::HTTPD_STREAM_OUTPUT));
 	live_player->set_done_callback([this] {
 		post_to_main_thread([this] {
@@ -393,6 +399,8 @@ void MainWindow::preview_clicked()
 			QModelIndex index = selected->currentIndex();
 			const Clip &clip = *playlist_clips->clip(index.row());
 			preview_player->play(clip);
+			preview_playing = true;
+			enable_or_disable_preview_button();
 			return;
 		}
 	}
@@ -403,6 +411,8 @@ void MainWindow::preview_clicked()
 	QItemSelectionModel *selected = ui->clip_list->selectionModel();
 	if (!selected->hasSelection()) {
 		preview_player->play(*cliplist_clips->back());
+		preview_playing = true;
+		enable_or_disable_preview_button();
 		return;
 	}
 
@@ -414,6 +424,8 @@ void MainWindow::preview_clicked()
 		clip.stream_idx = ui->preview_display->get_stream_idx();
 	}
 	preview_player->play(clip);
+	preview_playing = true;
+	enable_or_disable_preview_button();
 }
 
 void MainWindow::preview_angle_clicked(unsigned stream_idx)
@@ -636,6 +648,7 @@ void MainWindow::speed_slider_changed(int percent)
 	float speed = percent / 100.0f;
 	ui->speed_lock_btn->setText(QString::fromStdString(" " + to_string(percent) + "%"));
 	live_player->set_master_speed(speed);
+	midi_mapper.set_speed_light(speed);
 }
 
 void MainWindow::speed_lock_clicked()
@@ -647,6 +660,12 @@ void MainWindow::speed_lock_clicked()
 	lock_blink_timeout->stop();
 }
 
+void MainWindow::preview_player_done()
+{
+	preview_playing = false;
+	enable_or_disable_preview_button();
+}
+
 void MainWindow::live_player_done()
 {
 	playlist_clips->set_progress({});
@@ -1132,14 +1151,18 @@ void MainWindow::enable_or_disable_preview_button()
 		QItemSelectionModel *selected = ui->playlist->selectionModel();
 		if (selected->hasSelection()) {
 			ui->preview_btn->setEnabled(true);
-			midi_mapper.set_preview_enabled(true);
+			midi_mapper.set_preview_enabled(preview_playing ? MIDIMapper::On : MIDIMapper::Blinking);
 			return;
 		}
 	}
 
 	// TODO: Perhaps only enable this if something is actually selected.
 	ui->preview_btn->setEnabled(!cliplist_clips->empty());
-	midi_mapper.set_preview_enabled(!cliplist_clips->empty());
+	if (preview_playing) {
+		midi_mapper.set_preview_enabled(MIDIMapper::On);
+	} else {
+		midi_mapper.set_preview_enabled(cliplist_clips->empty() ? MIDIMapper::Off : MIDIMapper::Blinking);
+	}
 }
 
 void MainWindow::enable_or_disable_queue_button()
@@ -1280,6 +1303,7 @@ void MainWindow::set_master_speed(float speed)
 		ui->speed_lock_btn->setText(QString::fromStdString(" " + to_string(percent) + "%"));
 
 		live_player->set_master_speed(speed);
+		midi_mapper.set_speed_light(speed);
 	});
 }