From b3a7a9eddd8b800f1b921332e8fdacb72e0d9b20 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 28 Dec 2018 16:59:29 +0100 Subject: [PATCH] Remove obsolete member function. --- futatabi/mainwindow.cpp | 20 -------------------- futatabi/mainwindow.h | 1 - 2 files changed, 21 deletions(-) diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp index 70402cc..22b8d9c 100644 --- a/futatabi/mainwindow.cpp +++ b/futatabi/mainwindow.cpp @@ -523,26 +523,6 @@ void MainWindow::live_player_clip_done() } } -pair 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> clip_promise; - future> 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); diff --git a/futatabi/mainwindow.h b/futatabi/mainwindow.h index 67e46dd..e2934ff 100644 --- a/futatabi/mainwindow.h +++ b/futatabi/mainwindow.h @@ -103,7 +103,6 @@ private: void play_clicked(); void stop_clicked(); void live_player_clip_done(); - std::pair live_player_get_next_clip(); void live_player_clip_progress(const std::map &progress, double time_remaining); void set_output_status(const std::string &status); void playlist_duplicate(); -- 2.39.2