Fix an issue where the stop button would get grayed out if restarting playing.

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 346c6f684446bb179c64ec784c089c019aab9040..d73f579a9e6faee5880c6ac2447004a1df6cc99c 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -431,6 +431,14 @@ void MainWindow::defer_timer_expired()
 
 void MainWindow::content_changed()
 {
+       // If we are playing, update the part of the playlist that's not playing yet.
+       vector<ClipWithID> clips;
+       for (unsigned row = 0; row < playlist_clips->size(); ++row) {
+               clips.emplace_back(*playlist_clips->clip_with_id(row));
+       }
+       live_player->splice_play(clips);
+
+       // Serialize the state.
        if (defer_timeout->isActive() &&
            (!currently_deferring_model_changes || deferred_change_id != current_change_id)) {
                // There's some deferred event waiting, but this event is unrelated.
@@ -493,6 +501,7 @@ void MainWindow::play_clicked()
        }
        live_player->play(clips);
        playlist_clips->set_progress({ { start_row, 0.0f } });
+       ui->playlist->selectionModel()->clear();
        playlist_selection_changed();
 
        ui->stop_btn->setEnabled(true);
@@ -505,11 +514,12 @@ void MainWindow::stop_clicked()
        fake_clip.pts_out = 0;
        playlist_clips->set_progress({});
        live_player->play(fake_clip);
+       ui->stop_btn->setEnabled(false);
 }
 
 void MainWindow::live_player_done()
 {
-       set_output_status("paused");
+       playlist_selection_changed();
        playlist_clips->set_progress({});
        ui->stop_btn->setEnabled(false);
 }