Changeset 9827 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.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/FFmpegDecoderAudio.hpp (modified) (4 diffs)

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

@@ -7 +7 @@
 #include "FFmpegClocks.hpp"
 #include "FFmpegPacket.hpp"
-#include "FFmpegSampleFormat.hpp"
 
-#include "AudioSinkInterface.hpp"
+#include <osg/AudioStream>
+
 #include "BoundedMessageQueue.hpp"
+
 
 
@@ -37 +38 @@
     int frequency() const;
     int nbChannels() const;
-    FFmpegSampleFormat sampleFormat() const;
+    osg::AudioStream::SampleFormat sampleFormat() const;
 
 private:
@@ -64 +65 @@
     int                    m_frequency;
     int                    m_nb_channels;
-    FFmpegSampleFormat    m_sample_format;
+    osg::AudioStream::SampleFormat    m_sample_format;
 
     SinkPtr                m_audio_sink;
@@ -94 +95 @@
 
 
-inline FFmpegSampleFormat FFmpegDecoderAudio::sampleFormat() const
+inline osg::AudioStream::SampleFormat FFmpegDecoderAudio::sampleFormat() const
 {
     return m_sample_format;