X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=f95d42661b1ed5d50442beed89c7238fa614f675;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=86880bc34942561ba12a1488feb00663c2c9d6d8;hpb=62365221dd3cd80d6b771e9bf22b4f9365ee096a;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 86880bc34..f95d42661 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.
@@ -73,23 +73,21 @@ public:
 	 *  @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<Image> i, bool same, boost::shared_ptr<Subtitle> s);
+	void process_video (boost::shared_ptr<const Image> i, bool same, boost::shared_ptr<Subtitle> s);
 
 	/** Call with some audio data */
-	void process_audio (boost::shared_ptr<AudioBuffers>);
+	void process_audio (boost::shared_ptr<const AudioBuffers>);
 
 	/** Called when a processing run has finished */
 	virtual 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 ();
 
@@ -106,7 +104,7 @@ private:
 	static int const _history_size;
 
 	/** Number of video frames received so far */
-	SourceFrame _video_frames_in;
+	ContentVideoFrame _video_frames_in;
 	/** Number of video frames written for the DCP so far */
 	int _video_frames_out;