Put Time types in dcpomatic namespace.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index 6078141dcfab4d0f84fff1026154106ff389595d..f912c473cd5d7e37513cb7fa4a93df133d2c93d6 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -28,24 +28,33 @@
 using std::cout;
 using boost::optional;
 using boost::shared_ptr;
+using boost::weak_ptr;
+using namespace dcpomatic;
+
+Decoder::Decoder (weak_ptr<const Film> film)
+       : _film (film)
+{
+
+}
 
 /** @return Earliest time of content that the next pass() will emit */
 ContentTime
 Decoder::position () const
 {
        optional<ContentTime> pos;
+       shared_ptr<const Film> f = film();
 
-       if (video && !video->ignore() && (!pos || video->position() < *pos)) {
-               pos = video->position();
+       if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+               pos = video->position(f);
        }
 
-       if (audio && !audio->ignore() && (!pos || audio->position() < *pos)) {
-               pos = audio->position();
+       if (audio && !audio->ignore() && (!pos || audio->position(f) < *pos)) {
+               pos = audio->position(f);
        }
 
        BOOST_FOREACH (shared_ptr<TextDecoder> i, text) {
-               if (!i->ignore() && (!pos || i->position() < *pos)) {
-                       pos = i->position();
+               if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+                       pos = i->position(f);
                }
        }
 
@@ -75,3 +84,11 @@ 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;
+}