Changeset 5954

Timestamp:

Oct 14, 2009, 4:59:47 PM (15 years ago)

Author:

youngk

Message:

Bug Fix: SoundBase. The old sound file is now automatically unloaded upon change of sound file.

File:

• code/branches/sound3/src/orxonox/sound/BaseSound.cc (modified) (2 diffs)

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

@@ -111 +111 @@
     void BaseSound::setSource(const std::string& source)
     {
-        this->source_ = source;
-        if (!GameMode::playsSound())
-            return;
-
-        if (source.empty() && alIsSource(this->audioSource_))
+        if (!GameMode::playsSound()) 
+        {
+            this->source_ = source;
+            return;
+        }
+        
+        if (this->source_ != source && alIsSource(this->audioSource_))
         {
             // Unload sound
@@ -121 +123 @@
             alDeleteSources(1, &this->audioSource_);
             alDeleteBuffers(1, &this->audioBuffer_);
+        }
+
+        this->source_ = source;
+
+        if(source_.empty()) 
+        {
             return;
         }