Call the done callback only when the entire playlist is done. Simplifies a fair amoun...

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index bbaa5a417ab8c9c636d76f324f3b396e7ef236b4..3d3d8c11c908c13c53bd42a1bec5f3a9c26187e0 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -186,7 +186,7 @@ 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, double time_remaining) {
@@ -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);