Changeset 6730

Timestamp:

Apr 15, 2010, 1:57:51 PM (14 years ago)

Author:

erwin

Message:

Transfer changes again

File:

• code/branches/sound5/src/orxonox/sound/AmbientSound.cc (modified) (2 diffs)

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

@@ -149 +149 @@
     void AmbientSound::setStreamSource(const std::string& source)
     {
+        if (!GameMode::playsSound())
+        {
+            this->source_ = source;
+            return;
+        }
+
         this->audioSource_ = SoundManager::getInstance().getSoundSource(this);
         if (this->source_ == source)
@@ -178 +184 @@
             COUT(2) << "Sound: Failed to create thread." << std::endl;
 
+        if (alIsSource(this->audioSource_)) // already playing or paused
+        {
+            // 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: " << getALErrorString(error) << std::endl;
+            if (this->isPaused())
+                alSourcePause(this->audioSource_);
+        }
+        else // No source acquired so far, but might be set to playing or paused
+        {
+            if (this->isPlaying() || this->isPaused())
+                doPlay();
+            if (this->isPaused())
+            {
+                doPause();
+            }
+        }
 
         this->updateVolume();