Move the to-play playlist into Player.

[nageru] / futatabi / export.cpp

diff --git a/futatabi/export.cpp b/futatabi/export.cpp
index a653f01324775cfeee9a9eff0904315e391b4058..f3717409bff5235c47e7cfe91196eed80896826d 100644 (file)
--- a/futatabi/export.cpp
+++ b/futatabi/export.cpp
@@ -197,7 +197,7 @@ void export_multitrack_clip(const string &filename, const Clip &clip)
        progress.setValue(frames_written);
 }
 
-void export_interpolated_clip(const string &filename, const Clip &clip)
+void export_interpolated_clip(const string &filename, const vector<Clip> &clips)
 {
        AVFormatContext *avctx = nullptr;
        avformat_alloc_output_context2(&avctx, NULL, NULL, filename.c_str());
@@ -224,19 +224,23 @@ void export_interpolated_clip(const string &filename, const Clip &clip)
        progress.setMaximum(100000);
        progress.setValue(0);
 
+       double total_length = compute_time_left(clips, {{0, 0.0}});
+
        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] {
-               done_promise.set_value();
+       player.set_done_callback([&done_promise, &clip_idx, &clips] {
+               if (clip_idx >= clips.size()) {
+                       done_promise.set_value();
+               }
        });
-       player.set_progress_callback([&current_value] (const std::map<size_t, double> &player_progress) {
-               assert(player_progress.size() == 1);
-               current_value = player_progress.begin()->second;
+       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.play_clip(clip, /*clip_idx=*/0, clip.stream_idx);
+       player.play(clips);
        while (done.wait_for(std::chrono::milliseconds(100)) != future_status::ready && !progress.wasCanceled()) {
                progress.setValue(lrint(100000.0 * current_value));
        }