Changeset 6562 for code/branches/sound5/src/orxonox

Timestamp:

Mar 18, 2010, 3:48:49 PM (15 years ago)

Author:

erwin

Message:

More tries to fix the sound: there seems to be no context in the stream thread…

Location:

code/branches/sound5/src/orxonox/sound

Files:

• AmbientSound.cc (modified) (1 diff)
• SoundManager.cc (modified) (1 diff)
• SoundStreamer.cc (modified) (5 diffs)

code/branches/sound5/src/orxonox/sound/AmbientSound.cc

@@ -175 +175 @@
 
         this->soundstreamthread_ = boost::thread(SoundStreamer(), this->audioSource_, dataStream);
+        if(this->soundstreamthread_ == boost::thread())
+            COUT(2) << "Sound: Failed to create thread." << std::endl;
+
 
         this->updateVolume();

code/branches/sound5/src/orxonox/sound/SoundManager.cc

@@ -116 +116 @@
 
         // Create sound context and make it the currently used one
-        this->context_ = alcCreateContext(this->device_, NULL);
+        const ALint contattr[]  = {ALC_SYNC, 1, 0};
+        this->context_ = alcCreateContext(this->device_, contattr);
         if (this->context_ == NULL)
             ThrowException(InitialisationFailed, "Sound: Error: Could not create ALC context");

code/branches/sound5/src/orxonox/sound/SoundStreamer.cc

@@ -28 +28 @@
 
 #include <al.h>
+#include <alc.h>
 #include <vorbis/vorbisfile.h>
 #include "SoundManager.h"
@@ -67 +68 @@
         ALuint initbuffers[4];
         alGenBuffers(4, initbuffers);
+        if (ALint error = alGetError()) {
+            COUT(2) << "Sound: Streamer: Could not generate buffer:" << getALErrorString(error) << std::endl;
+            return;
+        }
         int current_section;
 
@@ -84 +89 @@
 
             alBufferData(initbuffers[i], format, &inbuffer, ret, vorbisInfo->rate);
+            alGetError();
         }
         alSourceQueueBuffers(audioSource, 4, initbuffers);
+        if (ALint error = alGetError()) {
+            COUT(2) << "Sound: Warning: Couldn't queue buffers: " << getALErrorString(error) << std::endl;
+        }
 
         while(true) // Stream forever, control through thread control
         {
             int processed;
+
+        if(alcGetCurrentContext() == NULL)
+            COUT(2) << "This should not be!" << std::endl;
+
             alGetSourcei(audioSource, AL_BUFFERS_PROCESSED, &processed);
             if (ALint error = alGetError())
-            COUT(2) << "Sound Warning: Couldn't get number of processed buffers: " << getALErrorString(error) << std::endl;
+            COUT(2) << "Sound: Warning: Couldn't get number of processed buffers: " << getALErrorString(error) << std::endl;
 
             if(processed > 0)
@@ -99 +112 @@
                 alSourceUnqueueBuffers(audioSource, processed, buffers);
                 if (ALint error = alGetError())
-                    COUT(2) << "Sound Warning: Couldn't unqueue buffers: " << getALErrorString(error) << std::endl;
+                    COUT(2) << "Sound: Warning: Couldn't unqueue buffers: " << getALErrorString(error) << std::endl;
 
                 for(int i = 0; i < processed; i++)
@@ -116 +129 @@
 
                     alBufferData(buffers[i], format, &inbuffer, ret, vorbisInfo->rate);
+                    alGetError();
                 }
 
                 alSourceQueueBuffers(audioSource, processed, buffers);
                 if (ALint error = alGetError())
-                    COUT(2) << "Sound Warning: Couldn't queue buffers: " << getALErrorString(error) << std::endl;
+                    COUT(2) << "Sound: Warning: Couldn't queue buffers: " << getALErrorString(error) << std::endl;
             }
-            msleep(250); // perhaps another value here is better
+            msleep(100); // perhaps another value here is better
         }
     }