Move estimation of time left into Player.

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 6553c8c56190e6f75571eee2d53e628563e2bd5c..bbaa5a417ab8c9c636d76f324f3b396e7ef236b4 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -189,9 +189,9 @@ MainWindow::MainWindow()
                        live_player_clip_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");
@@ -336,7 +336,7 @@ void MainWindow::preview_clicked()
                if (selected->hasSelection()) {
                        QModelIndex index = selected->currentIndex();
                        const Clip &clip = *playlist_clips->clip(index.row());
-                       preview_player->play({ clip });
+                       preview_player->play(clip);
                        return;
                }
        }
@@ -346,7 +346,7 @@ void MainWindow::preview_clicked()
 
        QItemSelectionModel *selected = ui->clip_list->selectionModel();
        if (!selected->hasSelection()) {
-               preview_player->play({ *cliplist_clips->back() });
+               preview_player->play(*cliplist_clips->back());
                return;
        }
 
@@ -357,7 +357,7 @@ void MainWindow::preview_clicked()
        } else {
                clip.stream_idx = ui->preview_display->get_stream_idx();
        }
-       preview_player->play({ clip });
+       preview_player->play(clip);
 }
 
 void MainWindow::preview_angle_clicked(unsigned stream_idx)
@@ -487,12 +487,9 @@ void MainWindow::play_clicked()
                start_row = selected->selectedRows(0)[0].row();
        }
 
-       live_player_index_to_row.clear();
-
-       vector<Clip> clips;
+       vector<Player::ClipWithRow> clips;
        for (unsigned row = start_row; row < playlist_clips->size(); ++row) {
-               live_player_index_to_row.emplace(clips.size(), row);
-               clips.push_back(*playlist_clips->clip(row));
+               clips.emplace_back(Player::ClipWithRow{ *playlist_clips->clip(row), row });
        }
        live_player->play(clips);
        playlist_clips->set_progress({ { start_row, 0.0f } });
@@ -509,8 +506,7 @@ void MainWindow::stop_clicked()
        fake_clip.pts_out = 0;
        size_t last_row = playlist_clips->size() - 1;
        playlist_clips->set_currently_playing(last_row, 0.0f);
-       live_player_index_to_row.clear();
-       live_player->play({ fake_clip });
+       live_player->play(fake_clip);
 }
 
 void MainWindow::live_player_clip_done()
@@ -562,22 +558,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)
 {
-       map<size_t, double> converted_progress;
-       for (const auto &it : progress) {
-               if (live_player_index_to_row.count(it.first)) {
-                       converted_progress.emplace(live_player_index_to_row[it.first], it.second);
-               }
-       }
-       playlist_clips->set_progress(converted_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");
+       playlist_clips->set_progress(progress);
+       set_output_status(format_duration(time_remaining) + " left");
 }
 
 void MainWindow::resizeEvent(QResizeEvent *event)
@@ -841,7 +825,7 @@ void MainWindow::preview_single_frame(int64_t pts, unsigned stream_idx, MainWind
        Clip fake_clip;
        fake_clip.pts_in = pts;
        fake_clip.pts_out = pts + 1;
-       preview_player->play({ fake_clip });
+       preview_player->play(fake_clip);
 }
 
 void MainWindow::playlist_selection_changed()
@@ -859,11 +843,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");
        }
 }