1 files changed, 11 insertions, 23 deletions

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 70e81a7e0..8f724525c 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -17,8 +17,8 @@
 
 */
 
-#ifndef DVDOMATIC_ENCODER_H
-#define DVDOMATIC_ENCODER_H
+#ifndef DCPOMATIC_ENCODER_H
+#define DCPOMATIC_ENCODER_H
 
 /** @file src/encoder.h
  *  @brief Encoder to J2K and WAV for DCP.
@@ -33,68 +33,62 @@
 #include <stdint.h>
 extern "C" {
 #include <libavutil/samplefmt.h>
-}
-#ifdef HAVE_SWRESAMPLE
-extern "C" {
 #include <libswresample/swresample.h>
 }
-#endif
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
 
 class Image;
-class Subtitle;
 class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
 class Writer;
+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
 {
 public:
-	Encoder (boost::shared_ptr<Film> f);
+	Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Job>);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
-	virtual void process_begin ();
+	void process_begin ();
 
 	/** 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);
+	void process_video (boost::shared_ptr<const Image> i, bool same, Time);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<const AudioBuffers>);
+	void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
 
 	/** Called when a processing run has finished */
-	virtual void process_end ();
+	void process_end ();
 
-	float current_frames_per_second () const;
+	float current_encoding_rate () const;
 	int video_frames_out () const;
 
 private:
 	
 	void frame_done ();
 	
-	void write_audio (boost::shared_ptr<const AudioBuffers> data);
-
 	void encoder_thread (ServerDescription *);
 	void terminate_threads ();
 
 	/** Film that we are encoding */
 	boost::shared_ptr<Film> _film;
+	boost::shared_ptr<Job> _job;
 
 	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _history_mutex;
@@ -105,15 +99,9 @@ private:
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
 
-	/** Number of video frames received so far */
-	SourceFrame _video_frames_in;
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;
 
-#if HAVE_SWRESAMPLE	
-	SwrContext* _swr_context;
-#endif
-
 	bool _have_a_real_frame;
 	bool _terminate;
 	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;