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

Timestamp:

03/03/09 21:59:16 (4 years ago)

Author:

robert

Message:

Added SDL audio path

Files:

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

OpenSceneGraph/trunk/examples/osgmovie/osgmovie.cpp

@@ -349 +349 @@
             _playing = true; 
             osg::notify(osg::NOTICE)<<"SDLAudioSink()::startPlaying()"<<std::endl;
-            
+
             osg::notify(osg::NOTICE)<<"  audioFrequency()="<<_audioStream->audioFrequency()<<std::endl;
             osg::notify(osg::NOTICE)<<"  audioNbChannels()="<<_audioStream->audioNbChannels()<<std::endl;
             osg::notify(osg::NOTICE)<<"  audioSampleFormat()="<<_audioStream->audioSampleFormat()<<std::endl;
-            
-            SDL_AudioSpec specs = { 0 };
-            SDL_AudioSpec wanted_specs = { 0 };
-
-            wanted_specs.freq = _audioStream->audioFrequency();
-            wanted_specs.format = AUDIO_S16SYS;
-            wanted_specs.channels = _audioStream->audioNbChannels();
-            wanted_specs.silence = 0;
-            wanted_specs.samples = 1024;
-            wanted_specs.callback = soundReadCallback;
-            wanted_specs.userdata = this;
-
-            if (SDL_OpenAudio(&wanted_specs, &specs) < 0)
-                    throw "SDL_OpenAudio() failed (" + std::string(SDL_GetError()) + ")";
-
-            SDL_PauseAudio(0);
+
+            SDL_AudioSpec specs = { 0 };
+            SDL_AudioSpec wanted_specs = { 0 };
+
+            wanted_specs.freq = _audioStream->audioFrequency();
+            wanted_specs.format = AUDIO_S16SYS;
+            wanted_specs.channels = _audioStream->audioNbChannels();
+            wanted_specs.silence = 0;
+            wanted_specs.samples = 1024;
+            wanted_specs.callback = soundReadCallback;
+            wanted_specs.userdata = this;
+
+            if (SDL_OpenAudio(&wanted_specs, &specs) < 0)
+                throw "SDL_OpenAudio() failed (" + std::string(SDL_GetError()) + ")";
+
+            SDL_PauseAudio(0);
 
         }
@@ -382 +382 @@
 void SDLAudioSink::soundReadCallback(void * const user_data, Uint8 * const data, const int datalen)
 {
-    osg::notify(osg::NOTICE)<<"SDLAudioSink::soundReadCallback"<<std::endl;
-
-        SDLAudioSink * sink = reinterpret_cast<SDLAudioSink*>(user_data);
-        osg::ref_ptr<osg::AudioStream> as = sink->_audioStream.get();
-        if (as.valid())
-        {            
-            as->consumeAudioBuffer(data, datalen);
-        }
+    SDLAudioSink * sink = reinterpret_cast<SDLAudioSink*>(user_data);
+    osg::ref_ptr<osg::AudioStream> as = sink->_audioStream.get();
+    if (as.valid())
+    {            
+        as->consumeAudioBuffer(data, datalen);
+    }
 }