Merge master.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index c84ee027addcad0eae79e257e42c36cf0a1478f5..70e6eea9a8ae30997d3f2132d31405e1e80e5850 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -51,7 +51,6 @@ class ServerDescription;
 class DCPVideoFrame;
 class EncodedData;
 class Writer;
-class Playlist;
 
 /** @class Encoder
  *  @brief Encoder to J2K and WAV for DCP.
@@ -63,7 +62,7 @@ class Playlist;
 class Encoder : public VideoSink, public AudioSink
 {
 public:
-       Encoder (boost::shared_ptr<Film> f, boost::shared_ptr<Playlist>);
+       Encoder (boost::shared_ptr<Film> f);
        virtual ~Encoder ();
 
        /** Called to indicate that a processing run is about to begin */
@@ -82,21 +81,18 @@ 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 ();
 
        /** Film that we are encoding */
        boost::shared_ptr<Film> _film;
-       boost::shared_ptr<Playlist> _playlist;
 
        /** Mutex for _time_history and _last_frame */
        mutable boost::mutex _history_mutex;
@@ -108,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;