FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Robert Osfield
2009-05-13 08:40:10 +00:00
parent 0cf92badba
commit 41b6c4dde8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/osgmovie/osgmovie.cpp
View File

@@ -335,7 +335,6 @@ class SDLAudioSink : public osg::AudioSink
virtual void startPlaying();
virtual bool playing() const { return _playing; }
static void soundReadCallback(void * user_data, uint8_t * data, int datalen);
bool _playing;
osg::observer_ptr<osg::AudioStream> _audioStream;
@@ -603,6 +602,16 @@ int main(int argc, char** argv)
#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()
{
if (_playing)
@@ -642,15 +651,6 @@ void SDLAudioSink::startPlaying()
}
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