Fix merge; other tweaks.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index c60ae4e599f0031f8cf4f2954baf64f1dc1696f1..2154da8bf6183102c9963ead832b0a9077b1a406 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -128,8 +128,10 @@ protected:
 
 private:
        void emit_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-       void emit_audio (uint8_t* data, int size);
+       void emit_audio (boost::shared_ptr<AudioBuffers>);
 
+       int64_t video_frames_to_audio_frames (SourceFrame v) const;
+       
        SourceFrame _video_frames_in;
        SourceFrame _video_frames_out;
        int64_t _audio_frames_in;
@@ -138,7 +140,7 @@ private:
        std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
 
        DelayLine* _delay_line;
-       int _delay_in_bytes;
+       int _delay_in_frames;
 
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;