X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=dd3c82764537bc23cb588a1dc9978e54db21b667;hb=3795723be95f2fe82f3c8b8b45b1a905b2c811fd;hp=ee300c51e6efecc87f3227ec4d65737a5fd5624e;hpb=60232cc3b83499d67ade40cbd403e04747b64795;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ee300c5..dd3c827 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3,6 +3,7 @@
 #include "clip_list.h"
 #include "disk_space_estimator.h"
 #include "flags.h"
+#include "frame_on_disk.h"
 #include "player.h"
 #include "post_to_main_thread.h"
 #include "timebase.h"
@@ -25,8 +26,6 @@ static ClipList *cliplist_clips;
 static PlayList *playlist_clips;
 
 extern int64_t current_pts;
-extern mutex frame_mu;
-extern vector<int64_t> frames[MAX_STREAMS];
 
 MainWindow::MainWindow()
 	: ui(new Ui::MainWindow),
@@ -199,6 +198,17 @@ void MainWindow::queue_clicked()
 
 void MainWindow::preview_clicked()
 {
+	if (ui->playlist->hasFocus()) {
+		// Allow the playlist as preview iff it has focus and something is selected.
+		QItemSelectionModel *selected = ui->playlist->selectionModel();
+		if (selected->hasSelection()) {
+			QModelIndex index = selected->currentIndex();
+			const Clip &clip = *playlist_clips->clip(index.row());
+			preview_player->play_clip(clip, index.row(), clip.stream_idx);
+			return;
+		}
+	}
+
 	if (cliplist_clips->empty())
 		return;
 
@@ -630,18 +640,20 @@ 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);
+		auto it = lower_bound(frames[stream_idx].begin(), frames[stream_idx].end(), pts,
+			[](const FrameOnDisk &frame, int64_t pts) { return frame.pts < pts; });
 		if (it != frames[stream_idx].end()) {
-			pts = *it;
+			pts = it->pts;
 		}
 	} else {
 		assert(rounding == FIRST_AT_OR_AFTER);
 		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);
+		auto it = upper_bound(frames[stream_idx].begin(), frames[stream_idx].end(), pts - 1,
+			[](int64_t pts, const FrameOnDisk &frame) { return pts < frame.pts; });
 		if (it != frames[stream_idx].end()) {
-			pts = *it;
+			pts = it->pts;
 		}
 	}