BOOST_FOREACH.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 52e8c04e6984f26d389d74ec61189fa80f749a69..bf0bd1a26945783d3501b9f91e82ac358a5bedc0 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -27,11 +27,12 @@
 
 using std::cout;
 using boost::optional;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
+using namespace dcpomatic;
 
 Decoder::Decoder (weak_ptr<const Film> film)
-       : _film (film)
+       : WeakConstFilm (film)
 {
 
 }
@@ -43,17 +44,26 @@ Decoder::position () const
        optional<ContentTime> pos;
        shared_ptr<const Film> f = film();
 
-       if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+       if (video && !video->ignore() && (!pos || video->position(f).get_value_or(ContentTime()) < *pos)) {
                pos = video->position(f);
        }
 
-       if (audio && !audio->ignore() && (!pos || audio->position(f) < *pos)) {
+       if (audio && !audio->ignore() && (!pos || audio->position(f).get_value_or(ContentTime()) < *pos)) {
                pos = audio->position(f);
        }
 
-       BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
-               if (!i->ignore() && (!pos || i->position(f) < *pos)) {
-                       pos = i->position(f);
+       /* Only decide position based on subtitle sources if there is nothing else
+          to go on.  Otherwise we can have problems with muxed sources which have
+          (for example) video, audio and a subtitle.  If the subtitle data runs out
+          before the video/audio the position() call will return the position of the
+          end of the subs.  This causes this file to be pass()ed in favour of others,
+          which can cause bugs like #1581.
+       */
+       if (!pos) {
+               for (auto i: text) {
+                       if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+                               pos = i->position(f);
+                       }
                }
        }
 
@@ -69,7 +79,7 @@ Decoder::seek (ContentTime, bool)
        if (audio) {
                audio->seek ();
        }
-       BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+       for (auto i: text) {
                i->seek ();
        }
 }
@@ -83,11 +93,3 @@ Decoder::only_text () const
        }
        return text.front ();
 }
-
-shared_ptr<const Film>
-Decoder::film () const
-{
-       shared_ptr<const Film> f = _film.lock ();
-       DCPOMATIC_ASSERT (f);
-       return f;
-}