X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=47385cc614c8c1387e756b254edbb85f6c78b333;hb=6bc12a2eeb9c84a539688f2f7eb876e3ea278a9f;hp=773688b34e668571bb5891e3f198e0b47eab478d;hpb=18614dda0d53b713ace5ad1df57298d049dba87f;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 773688b34..47385cc61 100644
--- 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)
 {
@@ -51,23 +50,29 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
 		sub = _timed_subtitle->subtitle ();
 	}
 
-	signal_video (image, false, sub, t);
+	signal_video (image, false, sub);
 	_last_source_time = t;
 }
 
+bool
+VideoDecoder::have_last_video () const
+{
+	return _last_image;
+}
+
 /** Called by subclasses to repeat the last video frame that we
  *  passed to emit_video().  If emit_video hasn't yet been called,
  *  we will generate a black frame.
  */
 void
-VideoDecoder::repeat_last_video (double t)
+VideoDecoder::repeat_last_video ()
 {
 	if (!_last_image) {
 		_last_image.reset (new SimpleImage (pixel_format(), native_size(), true));
 		_last_image->make_black ();
 	}
 
-	signal_video (_last_image, true, _last_subtitle, t);
+	signal_video (_last_image, true, _last_subtitle);
 }
 
 /** Emit our signal to say that some video data is ready.
@@ -76,10 +81,10 @@ VideoDecoder::repeat_last_video (double t)
  *  @param sub Subtitle for this frame, or 0.
  */
 void
-VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub, double t)
+VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
 {
 	TIMING (N_("Decoder emits %1"), _video_frame);
-	Video (image, same, sub, t);
+	Video (image, same, sub);
 	++_video_frame;
 
 	_last_image = image;
@@ -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());
 	}
 }