Fix some Futatabi shutdown problems.

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 1412e251fcf3b75ea771d65e7a59625a81ba1a3d..24a9d5b7e4e7db58e1d6bc894e060ba23548e485 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -126,8 +126,8 @@ MainWindow::MainWindow()
                this, &MainWindow::playlist_selection_changed);
        playlist_selection_changed();  // First time set-up.
 
-       preview_player = new Player(ui->preview_display, /*also_output_to_stream=*/false);
-       live_player = new Player(ui->live_display, /*also_output_to_stream=*/true);
+       preview_player.reset(new Player(ui->preview_display, /*also_output_to_stream=*/false));
+       live_player.reset(new Player(ui->live_display, /*also_output_to_stream=*/true));
        live_player->set_done_callback([this]{
                post_to_main_thread([this]{
                        live_player_clip_done();
@@ -149,6 +149,11 @@ MainWindow::MainWindow()
                this, &MainWindow::clip_list_selection_changed);
 }
 
+MainWindow::~MainWindow()
+{
+       // Empty so that we can forward-declare Player in the .h file.
+}
+
 void MainWindow::cue_in_clicked()
 {
        if (!cliplist_clips->empty() && cliplist_clips->back()->pts_out < 0) {
@@ -374,6 +379,9 @@ 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([this, &clip_promise] {