Changeset 6729

Timestamp:

Apr 15, 2010, 1:32:59 PM (14 years ago)

Author:

erwin

Message:

Commit changes to transfer to netbook

File:

• code/branches/sound5/src/orxonox/sound/SoundStreamer.cc (modified) (4 diffs)

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

@@ -107 +107 @@
             if(alcGetCurrentContext() == NULL)
             {
-                COUT(2) << "Sound: There is no context, terminating thread" << std::endl;
+                COUT(2) << "Sound: There is no context, terminating thread for " << dataStream->getName() << std::endl;
                 return;
             }
@@ -123 +123 @@
                     COUT(2) << "Sound: Warning: Couldn't unqueue buffers: " << getALErrorString(error) << std::endl;
 
+                int info;
+                alGetSourcei(audioSource, AL_SOURCE_STATE, &info);
+                if(info == AL_PLAYING)
+                    COUT(4) << "Sound: " << dataStream->getName() << " is playing." << std::endl;
+                else
+                    COUT(4) << "Sound: " << dataStream->getName() << " is not playing." << std::endl;
+
                 for(int i = 0; i < processed; i++)
                 {
@@ -132 +139 @@
                     else if (ret < 0)
                     {
-                        COUT(2) << "Sound: libvorbisfile: error reading the file" << std::endl;
+                        COUT(2) << "Sound: libvorbisfile: error reading the file " << dataStream->getName() << std::endl;
                         ov_clear(&vf);
                         return;
@@ -153 +160 @@
             catch(boost::thread_interrupted) {
                 COUT(4) << "Sound: Catched interruption. Terminating thread for " << dataStream->getName() << std::endl;
+                ALuint* buffers = new ALuint[5];
+                alSourceUnqueueBuffers(audioSource, 5, buffers);
+                if (ALint error = alGetError())
+                    COUT(2) << "Sound: Warning: Couldn't unqueue buffers: " << getALErrorString(error) << std::endl;
+
+                alDeleteBuffers(5, buffers);
+                if (ALint error = alGetError())
+                    COUT(2) << "Sound: Warning: Couldn't delete buffers: " << getALErrorString(error) << std::endl;
+
                 return;
             }