X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmainwindow.cpp;h=3d3d8c11c908c13c53bd42a1bec5f3a9c26187e0;hb=e64a84bb856263242278afa9770ae5d05e21b055;hp=5cbfb133927f18852b8c4367cd485e2e9a055c96;hpb=2b37c51ea17b77b88e2f7fda443109acc260aa8f;p=nageru

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 5cbfb13..3d3d8c1 100644
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -186,12 +186,12 @@ MainWindow::MainWindow()
 	live_player.reset(new Player(ui->live_display, Player::HTTPD_STREAM_OUTPUT));
 	live_player->set_done_callback([this] {
 		post_to_main_thread([this] {
-			live_player_clip_done();
+			live_player_done();
 		});
 	});
-	live_player->set_progress_callback([this](const map<size_t, double> &progress) {
-		post_to_main_thread([this, progress] {
-			live_player_clip_progress(progress);
+	live_player->set_progress_callback([this](const map<size_t, double> &progress, double time_remaining) {
+		post_to_main_thread([this, progress, time_remaining] {
+			live_player_clip_progress(progress, time_remaining);
 		});
 	});
 	set_output_status("paused");
@@ -493,7 +493,6 @@ void MainWindow::play_clicked()
 	}
 	live_player->play(clips);
 	playlist_clips->set_progress({ { start_row, 0.0f } });
-	playlist_clips->set_currently_playing(start_row, 0.0f);
 	playlist_selection_changed();
 
 	ui->stop_btn->setEnabled(true);
@@ -504,45 +503,16 @@ void MainWindow::stop_clicked()
 	Clip fake_clip;
 	fake_clip.pts_in = 0;
 	fake_clip.pts_out = 0;
-	size_t last_row = playlist_clips->size() - 1;
-	playlist_clips->set_currently_playing(last_row, 0.0f);
 	live_player->play(fake_clip);
 }
 
-void MainWindow::live_player_clip_done()
+void MainWindow::live_player_done()
 {
-	int row = playlist_clips->get_currently_playing();
-	if (row == -1 || row == int(playlist_clips->size()) - 1) {
-		set_output_status("paused");
-		playlist_clips->set_progress({});
-		playlist_clips->set_currently_playing(-1, 0.0f);
-	} else {
-		playlist_clips->set_progress({ { row + 1, 0.0f } });
-		playlist_clips->set_currently_playing(row + 1, 0.0f);
-	}
+	set_output_status("paused");
+	playlist_clips->set_progress({});
 	ui->stop_btn->setEnabled(false);
 }
 
-pair<Clip, size_t> MainWindow::live_player_get_next_clip()
-{
-	// playlist_clips can only be accessed on the main thread.
-	// Hopefully, we won't have to wait too long for this to come back.
-	//
-	// TODO: If MainWindow is in the process of being destroyed and waiting
-	// for Player to shut down, we could have a deadlock here.
-	promise<pair<Clip, size_t>> clip_promise;
-	future<pair<Clip, size_t>> clip = clip_promise.get_future();
-	post_to_main_thread([&clip_promise] {
-		int row = playlist_clips->get_currently_playing();
-		if (row != -1 && row < int(playlist_clips->size()) - 1) {
-			clip_promise.set_value(make_pair(*playlist_clips->clip(row + 1), row + 1));
-		} else {
-			clip_promise.set_value(make_pair(Clip(), 0));
-		}
-	});
-	return clip.get();
-}
-
 static string format_duration(double t)
 {
 	int t_ms = lrint(t * 1e3);
@@ -558,16 +528,10 @@ static string format_duration(double t)
 	return buf;
 }
 
-void MainWindow::live_player_clip_progress(const map<size_t, double> &progress)
+void MainWindow::live_player_clip_progress(const map<size_t, double> &progress, double time_remaining)
 {
 	playlist_clips->set_progress(progress);
-
-	vector<Clip> clips;
-	for (size_t row = 0; row < playlist_clips->size(); ++row) {
-		clips.push_back(*playlist_clips->clip(row));
-	}
-	double remaining = compute_time_left(clips, progress);
-	set_output_status(format_duration(remaining) + " left");
+	set_output_status(format_duration(time_remaining) + " left");
 }
 
 void MainWindow::resizeEvent(QResizeEvent *event)
@@ -849,11 +813,11 @@ void MainWindow::playlist_selection_changed()
 	if (!any_selected) {
 		set_output_status("paused");
 	} else {
-		vector<Clip> clips;
-		for (size_t row = 0; row < playlist_clips->size(); ++row) {
-			clips.push_back(*playlist_clips->clip(row));
+		vector<Player::ClipWithRow> clips;
+		for (size_t row = selected->selectedRows().front().row(); row < playlist_clips->size(); ++row) {
+			clips.emplace_back(Player::ClipWithRow{ *playlist_clips->clip(row), row });
 		}
-		double remaining = compute_time_left(clips, { { selected->selectedRows().front().row(), 0.0 } });
+		double remaining = compute_total_time(clips);
 		set_output_status(format_duration(remaining) + " ready");
 	}
 }