Clean up audio passing round a bit.

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

diff --git a/src/lib/decoder.h b/src/lib/decoder.h
index 312cbbe8e06b8e791d06ea999cc2555a2422f4f3..85b256f5bbe592629b8dad0c2b9c12396816aa73 100644 (file)
--- a/src/lib/decoder.h
+++ b/src/lib/decoder.h
@@ -99,11 +99,8 @@ public:
         */
        sigc::signal<void, boost::shared_ptr<Image>, int, boost::shared_ptr<Subtitle> > Video;
 
-       /** Emitted when some audio data is ready.
-        *  First parameter is the interleaved sample data, format is given in the FilmState.
-        *  Second parameter is the size of the data.
-        */
-       sigc::signal<void, uint8_t *, int> Audio;
+       /** Emitted when some audio data is ready */
+       sigc::signal<void, boost::shared_ptr<AudioBuffers> > Audio;
        
 protected:
        /** perform a single pass at our content */
@@ -137,6 +134,8 @@ protected:
 
 private:
        void setup_video_filters ();
+       void emit_audio (uint8_t* data, int size);
+       int bytes_per_audio_sample () const;
        
        /** last video frame to be processed */
        int _video_frame;