Changeset 10193 for OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

Timestamp:

05/13/09 10:40:10 (4 years ago)

Author:

robert

Message:

Rearranged static SDL callback so that it's after the SDL.h header.

Files:

• OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -336 +336 @@
         virtual bool playing() const { return _playing; }
 
-        static void soundReadCallback(void * user_data, uint8_t * data, int datalen);
 
         bool                                _playing;
@@ -604 +603 @@
 #include "SDL.h"
 
+static void soundReadCallback(void * user_data, uint8_t * data, int datalen)
+{
+    SDLAudioSink * sink = reinterpret_cast<SDLAudioSink*>(user_data);
+    osg::ref_ptr<osg::AudioStream> as = sink->_audioStream.get();
+    if (as.valid())
+    {
+        as->consumeAudioBuffer(data, datalen);
+    }
+}
+
 SDLAudioSink::~SDLAudioSink()
 {
@@ -643 +652 @@
 }
 
-void SDLAudioSink::soundReadCallback(void * const user_data, Uint8 * const data, const int datalen)
-{
-    SDLAudioSink * sink = reinterpret_cast<SDLAudioSink*>(user_data);
-    osg::ref_ptr<osg::AudioStream> as = sink->_audioStream.get();
-    if (as.valid())
-    {
-        as->consumeAudioBuffer(data, datalen);
-    }
-}
 
 #endif