Merge branch 'master' into content-rework-take5

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index c11b752ae21e201038e562ceeac62dacdc215f30..32b06085f21b741e060111cb0bd913fcfcf51d93 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -22,14 +22,15 @@
 #include "film.h"
 #include "image.h"
 #include "log.h"
-#include "options.h"
 #include "job.h"
 
+#include "i18n.h"
+
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
-       : Decoder (f, o, j)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+       : Decoder (f)
        , _video_frame (0)
        , _last_source_time (0)
 {
@@ -76,7 +77,7 @@ VideoDecoder::repeat_last_video ()
 void
 VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
 {
-       TIMING ("Decoder emits %1", _video_frame);
+       TIMING (N_("Decoder emits %1"), _video_frame);
        Video (image, same, sub);
        ++_video_frame;
 
@@ -100,19 +101,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)
+VideoDecoder::set_progress (Job* j) const
 {
-       _subtitle_stream = s;
-}
+       assert (j);
 
-void
-VideoDecoder::set_progress () const
-{
-       if (_job && _film->length()) {
-               _job->set_progress (float (_video_frame) / _film->length().get());
+       if (_film->video_length()) {
+               j->set_progress (float (_video_frame) / _film->video_length());
        }
 }