1 files changed, 20 insertions, 36 deletions

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 52ccfc166..8b02f7004 100644
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -39,18 +39,18 @@ extern "C" {
 #include <libswresample/swresample.h>
 }
 #endif
-#include <sndfile.h>
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
 
-class EncodeOptions;
 class Image;
 class Subtitle;
 class AudioBuffers;
 class Film;
 class ServerDescription;
 class DCPVideoFrame;
+class EncodedData;
+class Writer;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -62,7 +62,7 @@ class DCPVideoFrame;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-	Encoder (boost::shared_ptr<const Film> f, boost::shared_ptr<const EncodeOptions> o);
+	Encoder (boost::shared_ptr<Film> f);
 	virtual ~Encoder ();
 
 	/** Called to indicate that a processing run is about to begin */
@@ -82,20 +82,21 @@ public:
 	virtual void process_end ();
 
 	float current_frames_per_second () const;
-	bool skipping () const;
-	SourceFrame video_frame () const;
+	int video_frames_out () const;
 
-protected:
+private:
 	
 	void frame_done ();
-	void frame_skipped ();
 	
+	void write_audio (boost::shared_ptr<const AudioBuffers> audio);
+
+	void encoder_thread (ServerDescription *);
+	void terminate_worker_threads ();
+
 	/** Film that we are encoding */
-	boost::shared_ptr<const Film> _film;
-	/** Options */
-	boost::shared_ptr<const EncodeOptions> _opt;
+	boost::shared_ptr<Film> _film;
 
-	/** Mutex for _time_history, _just_skipped and _last_frame */
+	/** Mutex for _time_history and _last_frame */
 	mutable boost::mutex _history_mutex;
 	/** List of the times of completion of the last _history_size frames;
 	    first is the most recently completed.
@@ -103,41 +104,24 @@ protected:
 	std::list<struct timeval> _time_history;
 	/** Number of frames that we should keep history for */
 	static int const _history_size;
-	/** true if the last frame we processed was skipped (because it was already done) */
-	bool _just_skipped;
 
 	/** Number of video frames received so far */
-	SourceFrame _video_frame;
-	/** Number of audio frames received so far */
-	int64_t _audio_frame;
-
-private:
-	void close_sound_files ();
-	void write_audio (boost::shared_ptr<const AudioBuffers> audio);
-
-	void encoder_thread (ServerDescription *);
-	void terminate_worker_threads ();
-	void link (std::string, std::string) const;
+	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
 
-	/** List of links that we need to create when all frames have been processed;
-	 *  such that we need to call link (first, second) for each member of this list.
-	 *  In other words, `first' is a `real' frame and `second' should be a link to `first'.
-	 */
-	std::list<std::pair<int, int> > _links_required;
-
-	std::vector<SNDFILE*> _sound_files;
-	int64_t _audio_frames_written;
-
-	boost::optional<int> _last_real_frame;
-	bool _process_end;
-	std::list<boost::shared_ptr<DCPVideoFrame> > _queue;
+	bool _have_a_real_frame;
+	bool _terminate_encoder;
+	std::list<boost::shared_ptr<DCPVideoFrame> > _encode_queue;
 	std::list<boost::thread *> _worker_threads;
 	mutable boost::mutex _worker_mutex;
 	boost::condition _worker_condition;
+
+	boost::shared_ptr<Writer> _writer;
 };
 
 #endif