BOOST_FOREACH.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 3cadcca47198c1c79c801585b425e04971146bca..bf0bd1a26945783d3501b9f91e82ac358a5bedc0 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -27,12 +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)
 {
 
 }
@@ -44,11 +44,11 @@ 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);
        }
 
@@ -60,7 +60,7 @@ Decoder::position () const
           which can cause bugs like #1581.
        */
        if (!pos) {
-               BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+               for (auto i: text) {
                        if (!i->ignore() && (!pos || i->position(f) < *pos)) {
                                pos = i->position(f);
                        }
@@ -79,7 +79,7 @@ Decoder::seek (ContentTime, bool)
        if (audio) {
                audio->seek ();
        }
-       BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
+       for (auto i: text) {
                i->seek ();
        }
 }
@@ -93,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;
-}