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 b85132b7270fcc642f1baec01cd4dd4c50ffc094..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.
@@ -73,10 +73,10 @@ 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 ();
@@ -88,8 +88,6 @@ private:
        
        void frame_done ();
        
-       void write_audio (boost::shared_ptr<const AudioBuffers> data);
-
        void encoder_thread (ServerDescription *);
        void terminate_threads ();