Changeset 5962 for code/branches/sound3/src

Timestamp:

Oct 16, 2009, 7:10:03 PM (15 years ago)

Author:

rgrieder

Message:

Fixed sound reloading problem. The solution was in fact to first stop the playback (how trivial and yet unexpected…)

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)
     {
-        if (!GameMode::playsSound()) 
+        if (!GameMode::playsSound() || source == this->source_) 
         {
             this->source_ = source;
@@ -117 +117 @@
         }
         
-        if (this->source_ != source && alIsSource(this->audioSource_))
-        {
-            // Unload sound
+        if (alIsSource(this->audioSource_))
+        {
+            this->stop();
+            // Unload old sound first
             alSourcei(this->audioSource_, AL_BUFFER, 0);
             alDeleteSources(1, &this->audioSource_);
+            this->audioSource_ = 0;
             alDeleteBuffers(1, &this->audioBuffer_);
+            this->audioBuffer_ = 0;
         }
 
         this->source_ = source;
-
-        if(source_.empty()) 
-        {
-            return;
-        }
+        if (source_.empty()) 
+            return;
 
         COUT(3) << "Sound: OpenAL ALUT: loading file " << source << std::endl;