X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder.cc;h=785fb96f0c2ed4b0b7637abba296bcbb61ca40b1;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hp=114e2ebb4c509b5c52fa975a66ba1907021a1882;hpb=5757f3ba9d2cf3948bcad2b3f3ddbbf09ad754a5;p=dcpomatic.git

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 114e2ebb4..785fb96f0 100644
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,19 +19,26 @@
 */
 
 #include "decoder.h"
-#include "decoder_part.h"
-#include <iostream>
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "subtitle_decoder.h"
 
-using std::cout;
-using boost::optional;
-
-void
-Decoder::maybe_seek (optional<ContentTime> position, ContentTime time, bool accurate)
+ContentTime
+Decoder::position () const
 {
-	if (position && (time >= position.get() && time < (position.get() + ContentTime::from_seconds(1)))) {
-		/* No need to seek: caller should just pass() */
-		return;
+	ContentTime pos;
+
+	if (video && video->position()) {
+		pos = min (pos, video->position().get());
+	}
+
+	if (audio && audio->position()) {
+		pos = min (pos, audio->position().get());
+	}
+
+	if (subtitle && subtitle->position()) {
+		pos = min (pos, subtitle->position().get());
 	}
 
-	seek (time, accurate);
+	return pos;
 }