X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fencoder.h;h=b5a641f50d40492caa008115cf294ea4ec084de5;hb=764dfcd5aea143d1246873667e646f86d99e33a4;hp=6815fa6f660e6f24261407c2aadd43be081eec45;hpb=237a0052c60af768f4d62b00321932918b7ba4d9;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6815fa6f6..b5a641f50 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -36,11 +36,8 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #include "util.h"
-#include "video_sink.h"
-#include "audio_sink.h"
 
 class Image;
-class Subtitle;
 class AudioBuffers;
 class Film;
 class ServerDescription;
@@ -52,14 +49,14 @@ class Job;
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
  *
- *  Video is supplied to process_video as YUV frames, and audio
+ *  Video is supplied to process_video as RGB frames, and audio
  *  is supplied as uncompressed PCM in blocks of various sizes.
  */
 
-class Encoder : public VideoSink, public AudioSink
+class Encoder
 {
 public:
-	Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Job>);
+	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<Job>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -68,12 +65,11 @@ public:
 	/** Call with a frame of video.
 	 *  @param i Video frame image.
 	 *  @param same true if i is the same as the last time we were called.
-	 *  @param s A subtitle that should be on this frame, or 0.
 	 */
-	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s, Time);
+	void process_video (boost::shared_ptr<const Image> i, bool same);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 	/** Called when a processing run has finished */
 	void process_end ();
@@ -89,7 +85,7 @@ private:
 	void terminate_threads ();
 
 	/** Film that we are encoding */
-	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<const Film> _film;
 	boost::shared_ptr<Job> _job;
 
 	/** Mutex for _time_history and _last_frame */