Changeset 9827 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

Timestamp:

02/27/09 21:16:08 (4 years ago)

Author:

robert

Message:

Introduced osg::AudioStream? class to help manage audio streams coming in from movie reading plugins

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegImageStream.hpp

@@ -8 +8 @@
 #include <OpenThreads/Thread>
 
-#include "AudioSinkInterface.hpp"
-#include "FFmpegSampleFormat.hpp"
-
-
 
 #ifdef _WIN32
@@ -19 +15 @@
     #define OSGFFMPEG_EXPORT_API  __declspec(dllexport)
     #else
-    #define OSGFFMPEG_EXPORT_API  __declspec(dllimport)
+    #define OSGFFMPEG_EXPORT_API  __declspec(dllimport);
     #endif
 #else
@@ -56 +52 @@
         virtual void setAudioSink(osg::AudioSinkInterface* audio_sink);
         
-        void fillAudioBuffer(void * const buffer, const size_t size);
+        void consumeAudioBuffer(void * const buffer, const size_t size);
+        
+        bool audioStream() const;
+        int audioFrequency() const;
+        int audioNbChannels() const;
+        osg::AudioStream::SampleFormat audioSampleFormat() const;
 
         double duration() const;
@@ -64 +65 @@
         double videoFrameRate() const;
 
-        bool audioStream() const;
-        int audioFrequency() const;
-        int audioNbChannels() const;
-        FFmpegSampleFormat audioSampleFormat() const;
 
     private: