Improve audio mapping handling a bit.

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

diff --git a/src/lib/encoder.h b/src/lib/encoder.h
index 6cf5540c598a81e879f4a1f88d9845ad43785cfe..6815fa6f660e6f24261407c2aadd43be081eec45 100644 (file)
--- a/src/lib/encoder.h
+++ b/src/lib/encoder.h
@@ -33,12 +33,8 @@
 #include <stdint.h>
 extern "C" {
 #include <libavutil/samplefmt.h>
-}
-#ifdef HAVE_SWRESAMPLE
-extern "C" {
 #include <libswresample/swresample.h>
 }
-#endif
 #include "util.h"
 #include "video_sink.h"
 #include "audio_sink.h"
@@ -74,10 +70,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<const 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, Time);
 
        /** Call with some audio data */
-       void process_audio (boost::shared_ptr<const AudioBuffers>);
+       void process_audio (boost::shared_ptr<const AudioBuffers>, Time);
 
        /** Called when a processing run has finished */
        void process_end ();
@@ -105,15 +101,9 @@ private:
        /** Number of frames that we should keep history for */
        static int const _history_size;
 
-       /** Number of video frames received so far */
-       ContentVideoFrame _video_frames_in;
        /** Number of video frames written for the DCP so far */
        int _video_frames_out;
 
-#if HAVE_SWRESAMPLE    
-       SwrContext* _swr_context;
-#endif
-
        bool _have_a_real_frame;
        bool _terminate;
        std::list<boost::shared_ptr<DCPVideoFrame> > _queue;