Untested merge of master.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 16a076698eff8c652061a693dc95960f38e0cf9e..fd82384416b6166a461b0f9d9d43e1430ae2695b 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"
@@ -31,10 +30,10 @@ using std::cout;
 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)
+       , _last_content_time (0)
 {
 
 }
@@ -52,10 +51,11 @@ VideoDecoder::emit_video (shared_ptr<Image> image, bool same, double t)
                sub = _timed_subtitle->subtitle ();
        }
 
+       TIMING (N_("Decoder emits %1"), _video_frame);
        Video (image, same, sub, t);
        ++_video_frame;
-       
-       _last_source_time = t;
+
+       _last_content_time = t;
 }
 
 /** Set up the current subtitle.  This will be put onto frames that
@@ -74,21 +74,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());
        }
 }