Changeset 6070

Timestamp:

Nov 15, 2009, 3:53:12 PM (14 years ago)

Author:

rgrieder

Message:

OpenAL sources should be linked to the lifetime of a BaseSound.

File:

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

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

@@ -46 +46 @@
     {
         RegisterRootObject(BaseSound);
+
+        if (GameMode::playsSound())
+            alGenSources(1, &this->audioSource_);
     }
 
@@ -51 +54 @@
     {
         this->setSource("");
+        if (this->audioSource_)
+            alDeleteSources(1, &this->audioSource_);
     }
 
@@ -124 +129 @@
         }
         
-        if (alIsSource(this->audioSource_))
+        if (alIsSource(this->audioBuffer_))
         {
             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;
@@ -172 +175 @@
         }
 
-        alGenSources(1, &this->audioSource_);
         alSourcei(this->audioSource_, AL_BUFFER, this->audioBuffer_);
         if (alGetError() != AL_NO_ERROR)