Changeset 10961

Timestamp:

01/18/10 13:43:02 (3 years ago)

Author:

robert

Message:

From Serge Lages, "Here is a patch to allow setting an audio volume with the AudioSink? interface, I've also modified the ffmpeg plugin code to implement the ImageStream?'s setVolume method with its AudioSink?."

Location:

OpenSceneGraph/trunk

Files:

• include/osg/AudioStream (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegDecoderAudio.hpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegImageStream.cpp (modified) (1 diff)
• src/osgPlugins/ffmpeg/FFmpegImageStream.hpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osg/AudioStream

@@ -39 +39 @@
     virtual void setDelay(const double delay) { _delay = delay; }
 
+    virtual void setVolume(float) {}
+    virtual float getVolume() const { return 0.0f; }
 
 private:

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

@@ -113 +113 @@
 }
 
+void FFmpegDecoderAudio::setVolume(float volume)
+{
+    if (m_audio_sink.valid())
+    {
+        m_audio_sink->setVolume(volume);
+    }
+}
+
+float FFmpegDecoderAudio::getVolume() const
+{
+    if (m_audio_sink.valid())
+    {
+        return m_audio_sink->getVolume();
+    }
+    return 0.0f;
+}
 
 void FFmpegDecoderAudio::run()

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

@@ -35 +35 @@
     void close(bool waitForThreadToExit);
     
+    void setVolume(float volume);
+    float getVolume() const;
+
     virtual void run();
 

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

@@ -153 +153 @@
 }
 
+void FFmpegImageStream::setVolume(float volume)
+{
+    m_decoder->audio_decoder().setVolume(volume);
+}
+
+float FFmpegImageStream::getVolume() const
+{
+    return m_decoder->audio_decoder().getVolume();
+}
 
 double FFmpegImageStream::getLength() const

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

@@ -33 +33 @@
         virtual void seek(double time);
         virtual void quit(bool waitForThreadToExit = true);
+
+        virtual void setVolume(float volume);
+        virtual float getVolume() const;
 
         virtual double getLength() const;