X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=ca1e7ab568df884e6708a7da77d3dabcf9022211;hb=127672223cca569986e35c91265e269ed5a6561c;hp=0fa16bc325b8b6ee8a309098c54a066359d99e1a;hpb=b1873c51b2e8265a01a8f0eced7fc3465f1677dc;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 0fa16bc32..ca1e7ab56 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -25,11 +25,13 @@
 #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, shared_ptr<VideoContent> c, DecodeOptions o)
+	: Decoder (f, o)
 	, _video_frame (0)
 	, _last_source_time (0)
 {
@@ -53,6 +55,10 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
 	_last_source_time = t;
 }
 
+/** 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 ()
 {
@@ -64,10 +70,15 @@ VideoDecoder::repeat_last_video ()
 	signal_video (_last_image, true, _last_subtitle);
 }
 
+/** Emit our signal to say that some video data is ready.
+ *  @param image Video frame.
+ *  @param same true if `image' is the same as the last one we emitted.
+ *  @param sub Subtitle for this frame, or 0.
+ */
 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;
 
@@ -75,6 +86,11 @@ VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subti
 	_last_subtitle = sub;
 }
 
+/** Set up the current subtitle.  This will be put onto frames that
+ *  fit within its time specification.  s may be 0 to say that there
+ *  is no current subtitle.
+ *  @param s New current subtitle, or 0.
+ */
 void
 VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 {
@@ -87,15 +103,14 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 }
 
 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 0
+	XXX
+	if (_film->length()) {
+		j->set_progress (float (_video_frame) / _film->length().get());
 	}
+#endif	
 }