More automated renaming.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 114e2ebb4c509b5c52fa975a66ba1907021a1882..52949a0989d83be7895f2117591a3dc7fedadc17 100644 (file)
--- 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-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,19 +19,59 @@
 */
 
 #include "decoder.h"
-#include "decoder_part.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
+#include "text_decoder.h"
+#include <boost/optional.hpp>
 #include <iostream>
 
 using std::cout;
 using boost::optional;
+using boost::shared_ptr;
+
+/** @return Earliest time of content that the next pass() will emit */
+ContentTime
+Decoder::position () const
+{
+       optional<ContentTime> pos;
+
+       if (video && !video->ignore() && (!pos || video->position() < *pos)) {
+               pos = video->position();
+       }
+
+       if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) {
+               pos = audio->position();
+       }
+
+       BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
+               if (!i->ignore() && (!pos || i->position() < *pos)) {
+                       pos = i->position();
+               }
+       }
+
+       return pos.get_value_or(ContentTime());
+}
 
 void
-Decoder::maybe_seek (optional<ContentTime> position, ContentTime time, bool accurate)
+Decoder::seek (ContentTime, bool)
 {
-       if (position && (time >= position.get() && time < (position.get() + ContentTime::from_seconds(1)))) {
-               /* No need to seek: caller should just pass() */
-               return;
+       if (video) {
+               video->seek ();
+       }
+       if (audio) {
+               audio->seek ();
+       }
+       BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
+               i->seek ();
        }
+}
 
-       seek (time, accurate);
+shared_ptr<TextDecoder>
+Decoder::only_caption () const
+{
+       DCPOMATIC_ASSERT (caption.size() < 2);
+       if (caption.empty ()) {
+               return shared_ptr<TextDecoder> ();
+       }
+       return caption.front ();
 }