X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.h;h=f95d42661b1ed5d50442beed89c7238fa614f675;hb=f861018389acd9d277fe34d7621182b9b54f977f;hp=70e81a7e071d483f3ae6bad45faf5b76f9c8c797;hpb=8dd9ea3086b4934f2719648ffa6333c0d106ff36;p=dcpomatic.git

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 70e81a7e0..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.
@@ -81,15 +81,13 @@ public:
 	/** 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;