Increase fudge factor at the boundary between audio signal and silence.

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

diff --git a/src/lib/decoder.cc b/src/lib/decoder.cc
index fb7663f5ca8833caadcd02cd46034b8733f07491..52e8c04e6984f26d389d74ec61189fa80f749a69 100644 (file)
--- a/src/lib/decoder.cc
+++ b/src/lib/decoder.cc
@@ -28,24 +28,32 @@
 using std::cout;
 using boost::optional;
 using boost::shared_ptr;
+using boost::weak_ptr;
+
+Decoder::Decoder (weak_ptr<const Film> film)
+       : _film (film)
+{
+
+}
 
 /** @return Earliest time of content that the next pass() will emit */
 ContentTime
-Decoder::position (shared_ptr<const Film> film) const
+Decoder::position () const
 {
        optional<ContentTime> pos;
+       shared_ptr<const Film> f = film();
 
-       if (video && !video->ignore() && (!pos || video->position(film) < *pos)) {
-               pos = video->position(film);
+       if (video && !video->ignore() && (!pos || video->position(f) < *pos)) {
+               pos = video->position(f);
        }
 
-       if (audio && !audio->ignore() && (!pos || audio->position(film) < *pos)) {
-               pos = audio->position(film);
+       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(film) < *pos)) {
-                       pos = i->position(film);
+               if (!i->ignore() && (!pos || i->position(f) < *pos)) {
+                       pos = i->position(f);
                }
        }
 
@@ -53,7 +61,7 @@ Decoder::position (shared_ptr<const Film> film) const
 }
 
 void
-Decoder::seek (shared_ptr<const Film>, ContentTime, bool)
+Decoder::seek (ContentTime, bool)
 {
        if (video) {
                video->seek ();
@@ -75,3 +83,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;
+}