Add some binary search helpers.

[nageru] / futatabi / mainwindow.cpp

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 81ef10b3a4bb1e8ab1a4cd3e72502e3cfce65558..57693ef91b2f47ade0a4a3b143af5dc68c3e73c0 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) {
@@ -159,6 +164,7 @@ void MainWindow::cue_in_clicked()
        clip.pts_in = current_pts;
        cliplist_clips->add_clip(clip);
        playlist_selection_changed();
+       ui->clip_list->scrollToBottom();
 }
 
 void MainWindow::cue_out_clicked()
@@ -182,6 +188,7 @@ void MainWindow::queue_clicked()
                if (clip.pts_out != -1) {
                        playlist_clips->add_clip(clip);
                        playlist_selection_changed();
+                       ui->playlist->scrollToBottom();
                }
                return;
        }
@@ -198,6 +205,12 @@ void MainWindow::queue_clicked()
        if (clip.pts_out != -1) {
                playlist_clips->add_clip(clip);
                playlist_selection_changed();
+               ui->playlist->scrollToBottom();
+               if (!ui->playlist->selectionModel()->hasSelection()) {
+                       // TODO: Figure out why this doesn't always seem to actually select the row.
+                       QModelIndex bottom = playlist_clips->index(playlist_clips->size() - 1, 0);
+                       ui->playlist->setCurrentIndex(bottom);
+               }
        }
 }
 
@@ -366,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] {
@@ -645,8 +661,7 @@ void MainWindow::preview_single_frame(int64_t pts, unsigned stream_idx, MainWind
                lock_guard<mutex> lock(frame_mu);
                if (frames[stream_idx].empty())
                        return;
-               auto it = lower_bound(frames[stream_idx].begin(), frames[stream_idx].end(), pts,
-                       [](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; });
+               auto it = find_last_frame_before(frames[stream_idx], pts);
                if (it != frames[stream_idx].end()) {
                        pts = it->pts;
                }
@@ -655,8 +670,7 @@ void MainWindow::preview_single_frame(int64_t pts, unsigned stream_idx, MainWind
                lock_guard<mutex> lock(frame_mu);
                if (frames[stream_idx].empty())
                        return;
-               auto it = upper_bound(frames[stream_idx].begin(), frames[stream_idx].end(), pts - 1,
-                       [](int64_t pts, const FrameOnDisk &frame) { return pts < frame.pts; });
+               auto it = find_first_frame_at_or_after(frames[stream_idx], pts);
                if (it != frames[stream_idx].end()) {
                        pts = it->pts;
                }