Changeset 10925

Timestamp:

01/07/10 15:35:17 (3 years ago)

Author:

robert

Message:

Added virtual pause() method into osg::AudioSink? to support pausing of a movie thread and it's associated audio.

Updated osgmovie plugin to use the pause support.

Location:

OpenSceneGraph/trunk

Files:

• examples/osgmovie/osgmovie.cpp (modified) (3 diffs)
• include/osg/AudioStream (modified) (2 diffs)
• src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (modified) (2 diffs)
• src/osgWrappers/osg/AudioStream.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -384 +384 @@
 
         SDLAudioSink(osg::AudioStream* audioStream):
-            _playing(false),
+            _started(false),
+            _paused(false),
             _audioStream(audioStream) {}
 
         ~SDLAudioSink();
 
-        virtual void startPlaying();
-        virtual bool playing() const { return _playing; }
-
-
-        bool                                _playing;
+        virtual void play();
+        virtual void pause();
+        virtual void stop();
+
+        virtual bool playing() const { return _started && !_paused; }
+
+
+        bool                                _started;
+        bool                                _paused;
         osg::observer_ptr<osg::AudioStream> _audioStream;
 };
@@ -671 +676 @@
 SDLAudioSink::~SDLAudioSink()
 {
-    if (_playing)
-    {
-
-        SDL_PauseAudio(1);
-        SDL_CloseAudio();
-
-        osg::notify(osg::NOTICE)<<"~SDLAudioSink() destructor, but still playing"<<std::endl;
-    }
-}
-
-void SDLAudioSink::startPlaying()
-{
-    _playing = true;
+    stop();
+}
+
+void SDLAudioSink::play()
+{
+    if (_started)
+    {
+        if (_paused)
+        {
+            SDL_PauseAudio(0);
+            _paused = false;
+        }
+        return;
+    }
+
+    _started = true;
+    _paused = false;
+
     osg::notify(osg::NOTICE)<<"SDLAudioSink()::startPlaying()"<<std::endl;
 
@@ -708 +718 @@
 }
 
+void SDLAudioSink::pause()
+{
+    if (_started)
+    {
+        SDL_PauseAudio(1);
+        _paused = true;
+    }
+}
+
+void SDLAudioSink::stop()
+{
+    if (_started)
+    {
+        if (!_paused) SDL_PauseAudio(1);
+        SDL_CloseAudio();
+
+        osg::notify(osg::NOTICE)<<"~SDLAudioSink() destructor, but still playing"<<std::endl;
+    }
+}
 
 #endif

OpenSceneGraph/trunk/include/osg/AudioStream

@@ -27 +27 @@
     AudioSink();
 
-    virtual void startPlaying() = 0;
+    virtual const char * libraryName() const { return "osg"; }
+    virtual const char * className() const { return "AudioSinkInterface"; }
+
+    virtual void play() = 0;
+    virtual void pause()  = 0;
+    virtual void stop()  = 0;
+
     virtual bool playing() const = 0;
 
@@ -33 +39 @@
     virtual void setDelay(const double delay) { _delay = delay; }
 
-    virtual const char * libraryName() const { return "osgFFmpeg"; }
-    virtual const char * className() const { return "AudioSinkInterface"; }
 
 private:

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

@@ -92 +92 @@
 void FFmpegDecoderAudio::pause(bool pause)
 {
-    if(pause)
-        m_paused = true;
-    else
-        m_paused = false;
+    if (pause != m_paused)
+    {
+        m_paused = pause;
+        if (m_audio_sink.valid())
+        {
+            if (m_paused) m_audio_sink->pause();
+            else m_audio_sink->play();
+        }
+    }
 }
 
@@ -184 +189 @@
     {
         m_clocks.audioSetDelay(m_audio_sink->getDelay());
-        m_audio_sink->startPlaying();
+        m_audio_sink->play();
     }
     else

OpenSceneGraph/trunk/src/osgWrappers/osg/AudioStream.cpp

@@ -29 +29 @@
                        "",
                        "");
-        I_Method0(void, startPlaying,
+        I_Method0(const char *, libraryName,
+                  Properties::VIRTUAL,
+                  __C5_char_P1__libraryName,
+                  "return the name of the object's library. ",
+                  "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
+        I_Method0(const char *, className,
+                  Properties::VIRTUAL,
+                  __C5_char_P1__className,
+                  "return the name of the object's class type. ",
+                  "Must be defined by derived classes. ");
+        I_Method0(void, play,
                   Properties::PURE_VIRTUAL,
-                  __void__startPlaying,
+                  __void__play,
+                  "",
+                  "");
+        I_Method0(void, pause,
+                  Properties::PURE_VIRTUAL,
+                  __void__pause,
+                  "",
+                  "");
+        I_Method0(void, stop,
+                  Properties::PURE_VIRTUAL,
+                  __void__stop,
                   "",
                   "");
@@ -49 +69 @@
                   "",
                   "");
-        I_Method0(const char *, libraryName,
-                  Properties::VIRTUAL,
-                  __C5_char_P1__libraryName,
-                  "return the name of the object's library. ",
-                  "Must be defined by derived classes. The OpenSceneGraph convention is that the namespace of a library is the same as the library name. ");
-        I_Method0(const char *, className,
-                  Properties::VIRTUAL,
-                  __C5_char_P1__className,
-                  "return the name of the object's class type. ",
-                  "Must be defined by derived classes. ");
         I_SimpleProperty(double, Delay, 
                          __double__getDelay,