Merge master; fix crash on new film.

[dcpomatic.git] / src / lib / encoder.h

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 70e81a7e071d483f3ae6bad45faf5b76f9c8c797..f95d42661b1ed5d50442beed89c7238fa614f675 100644 (file)
--- 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;