Merge master.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 773688b34e668571bb5891e3f198e0b47eab478d..fd2b28d7f13ed8bee4166491aff55620dc800452 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -22,7 +22,6 @@
 #include "film.h"
 #include "image.h"
 #include "log.h"
-#include "options.h"
 #include "job.h"
 
 #include "i18n.h"
@@ -30,8 +29,8 @@
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o)
-       : Decoder (f, o)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+       : Decoder (f)
        , _video_frame (0)
        , _last_source_time (0)
 {
@@ -52,7 +51,12 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
        }
 
        signal_video (image, false, sub, t);
-       _last_source_time = t;
+}
+
+bool
+VideoDecoder::have_last_video () const
+{
+       return _last_image;
 }
 
 /** Called by subclasses to repeat the last video frame that we
@@ -79,11 +83,12 @@ void
 VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub, double t)
 {
        TIMING (N_("Decoder emits %1"), _video_frame);
-       Video (image, same, sub, t);
+       Video (image, same, sub);
        ++_video_frame;
 
        _last_image = image;
        _last_subtitle = sub;
+       _last_source_time = t;
 }
 
 /** Set up the current subtitle.  This will be put onto frames that
@@ -102,21 +107,12 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
        }
 }
 
-/** Set which stream of subtitles we should use from our source.
- *  @param s Stream to use.
- */
-void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-       _subtitle_stream = s;
-}
-
 void
 VideoDecoder::set_progress (Job* j) const
 {
        assert (j);
-       
-       if (_film->length()) {
-               j->set_progress (float (_video_frame) / _film->length().get());
+
+       if (_film->video_length()) {
+               j->set_progress (float (_video_frame) / _film->video_length());
        }
 }