Changeset 6340 for code/branches/presentation2

Timestamp:

Dec 13, 2009, 5:39:22 PM (15 years ago)

Author:

rgrieder

Message:

Fixed bug: Ambient sounds were sometimes not played at all (caused by the source management changes).
And removed some debug output.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (2 diffs)
• SoundBuffer.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/sound/BaseSound.cc

@@ -224 +224 @@
 
         this->source_ = source;
+        // Don't load ""
         if (source_.empty())
             return;
 
+        // Get new sound buffer
         this->soundBuffer_ = SoundManager::getInstance().getSoundBuffer(this->source_);
         if (this->soundBuffer_ == NULL)
             return;
 
-        if (alIsSource(this->audioSource_))
-        {
+        if (alIsSource(this->audioSource_)) // already playing or paused
+        {
+            // Set new buffer 
             alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
             if (ALuint error = alGetError())
@@ -240 +243 @@
             }
 
-            if (this->isPlaying() || this->isPaused())
-            {
-                alSourcePlay(this->audioSource_);
-                if (int error = alGetError())
-                    COUT(2) << "Sound: Error playing sound: " << SoundManager::getALErrorString(error) << std::endl;
-            }
+            // Sound was already playing or paused because there was a source acquired
+            assert(this->isPlaying() || this->isPaused());
+            alSourcePlay(this->audioSource_);
+            if (int error = alGetError())
+                COUT(2) << "Sound: Error playing sound: " << SoundManager::getALErrorString(error) << std::endl;
             if (this->isPaused())
                 alSourcePause(this->audioSource_);
+        }
+        else // No source acquired so far, but might be set to playing or paused
+        {
+            State state = this->state_; // save
+            if (this->isPlaying() || this->isPaused())
+                BaseSound::play();
+            if (state == Paused)
+            {
+                this->state_ = Paused;
+                BaseSound::pause();
+            }
         }
     }

code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc

@@ -33 +33 @@
 #include <vorbis/vorbisfile.h>
 
-#include "util/Clock.h"
-#include "core/Game.h"
 #include "util/Exception.h"
 #include "util/StringUtils.h"
@@ -63 +61 @@
         if (getLowercase(extension) == "ogg")
         {
-            int before = Game::getInstance().getGameClock().getRealMicroseconds();
             // Try ogg loader
             this->loadOgg(fileInfo, dataStream);
-            int after = Game::getInstance().getGameClock().getRealMicroseconds();
-            COUT(0) << filename << ": " << (after - before) << std::endl;
         }
         else