Changeset 9869 for OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp

Timestamp:

03/08/09 17:48:48 (4 years ago)

Author:

robert

Message:

Fixed thread exit problems

Files:

• OpenSceneGraph/trunk/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp (modified) (3 diffs)

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

@@ -38 +38 @@
     {
         m_exit = true;
+#if 0        
+        while(isRunning()) { OpenThreads::YieldCurrentThread(); }
+#else        
         join();
+#endif
     }
 }
@@ -86 +90 @@
 
 
+void FFmpegDecoderAudio::close(bool waitForThreadToExit)
+{
+    m_exit = true;
+    
+    if (isRunning() && waitForThreadToExit)
+    {
+        while(isRunning()) { OpenThreads::Thread::YieldCurrentThread(); }
+    }
+}
+
 
 void FFmpegDecoderAudio::run()
@@ -104 +118 @@
     }
 }
-