More automated renaming.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 0d4f4babfa9db0831650529ae4ead927260dc7f3..52949a0989d83be7895f2117591a3dc7fedadc17 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -21,12 +21,13 @@
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "subtitle_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
@@ -42,8 +43,10 @@ Decoder::position () const
                pos = audio->position();
        }
 
-       if (subtitle && !subtitle->ignore() && (!pos || subtitle->position() < *pos)) {
-               pos = subtitle->position();
+       BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
+               if (!i->ignore() && (!pos || i->position() < *pos)) {
+                       pos = i->position();
+               }
        }
 
        return pos.get_value_or(ContentTime());
@@ -52,10 +55,23 @@ Decoder::position () const
 void
 Decoder::seek (ContentTime, bool)
 {
+       if (video) {
+               video->seek ();
+       }
        if (audio) {
                audio->seek ();
        }
-       if (subtitle) {
-               subtitle->seek ();
+       BOOST_FOREACH (shared_ptr<TextDecoder> i, caption) {
+               i->seek ();
+       }
+}
+
+shared_ptr<TextDecoder>
+Decoder::only_caption () const
+{
+       DCPOMATIC_ASSERT (caption.size() < 2);
+       if (caption.empty ()) {
+               return shared_ptr<TextDecoder> ();
        }
+       return caption.front ();
 }