X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fexport.cpp;h=d513cf0dacf5a6f6f74ff9cbe14ffde737cee615;hb=9921f1fe12f5a7dadab7e84069fa8591d5c5663d;hp=2b9f5317a0dcfb5612edde9cbcd70889ec9f7a9c;hpb=2b37c51ea17b77b88e2f7fda443109acc260aa8f;p=nageru

diff --git a/futatabi/export.cpp b/futatabi/export.cpp
index 2b9f531..d513cf0 100644
--- a/futatabi/export.cpp
+++ b/futatabi/export.cpp
@@ -223,27 +223,24 @@ void export_interpolated_clip(const string &filename, const vector<Clip> &clips)
 	progress.setMaximum(100000);
 	progress.setValue(0);
 
-	double total_length = compute_time_left(clips, { { 0, 0.0 } });
-	vector<Player::ClipWithRow> clips_with_row;
+	vector<ClipWithID> clips_with_id;
 	for (const Clip &clip : clips) {
-		clips_with_row.emplace_back(Player::ClipWithRow{ clip, 0 });
+		clips_with_id.emplace_back(ClipWithID{ clip, 0 });
 	}
+	double total_length = compute_total_time(clips_with_id);
 
 	promise<void> done_promise;
 	future<void> done = done_promise.get_future();
 	std::atomic<double> current_value{ 0.0 };
-	size_t clip_idx = 0;
 
 	Player player(/*destination=*/nullptr, Player::FILE_STREAM_OUTPUT, closer.release());
-	player.set_done_callback([&done_promise, &clip_idx, &clips] {
-		if (clip_idx >= clips.size()) {
-			done_promise.set_value();
-		}
+	player.set_done_callback([&done_promise] {
+		done_promise.set_value();
 	});
-	player.set_progress_callback([&current_value, &clips, total_length](const std::map<size_t, double> &player_progress) {
-		current_value = 1.0 - compute_time_left(clips, player_progress) / total_length;
+	player.set_progress_callback([&current_value, total_length](const std::map<uint64_t, double> &player_progress, double time_remaining) {
+		current_value = 1.0 - time_remaining / total_length;
 	});
-	player.play(clips_with_row);
+	player.play(clips_with_id);
 	while (done.wait_for(std::chrono::milliseconds(100)) != future_status::ready && !progress.wasCanceled()) {
 		progress.setValue(lrint(100000.0 * current_value));
 	}