Fix a couple more crashes with incorrect KDMs (#1000).

[dcpomatic.git] / src / lib / decoder.cc

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 785fb96f0c2ed4b0b7637abba296bcbb61ca40b1..502273de1e49f5a551110674a5d8284572dbe180 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -22,23 +22,43 @@
 #include "video_decoder.h"
 #include "audio_decoder.h"
 #include "subtitle_decoder.h"
+#include <boost/optional.hpp>
+#include <iostream>
 
+using std::cout;
+using boost::optional;
+
+/** @return Earliest time of content that the next pass() will emit */
 ContentTime
 Decoder::position () const
 {
-       ContentTime pos;
+       optional<ContentTime> pos;
 
-       if (video && video->position()) {
-               pos = min (pos, video->position().get());
+       if (video && !video->ignore() && (!pos || video->position() < *pos)) {
+               pos = video->position();
        }
 
-       if (audio && audio->position()) {
-               pos = min (pos, audio->position().get());
+       if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) {
+               pos = audio->position();
        }
 
-       if (subtitle && subtitle->position()) {
-               pos = min (pos, subtitle->position().get());
+       if (subtitle && !subtitle->ignore() && (!pos || subtitle->position() < *pos)) {
+               pos = subtitle->position();
        }
 
-       return pos;
+       return pos.get_value_or(ContentTime());
+}
+
+void
+Decoder::seek (ContentTime, bool)
+{
+       if (video) {
+               video->seek ();
+       }
+       if (audio) {
+               audio->seek ();
+       }
+       if (subtitle) {
+               subtitle->seek ();
+       }
 }