Changeset 6204 for code/branches

Timestamp:

Dec 2, 2009, 5:06:57 PM (15 years ago)

Author:

rgrieder

Message:

Better error handling for sound.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (3 diffs)
• WorldSound.cc (modified) (1 diff)

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

@@ -124 +124 @@
     {
         if (alIsSource(this->audioSource_))
+        {
             alSourcef(this->audioSource_, AL_GAIN, this->volume_*this->getVolumeGain());
+            if (int error = alGetError())
+                COUT(2) << "Sound: Error setting volume: " << error << std::endl;
+        }
     }
 
@@ -144 +148 @@
         this->pitch_ = pitch;
         if (GameMode::playsSound())
+        {
+            if (int error = alGetError())
+                COUT(2) << "Sound: Error setting pitch: " << error << std::endl;
             alSourcei(this->audioSource_, AL_PITCH, pitch);
+        }
     }
 
@@ -189 +197 @@
         this->updateVolume();
         this->setPitch(this->getPitch());
-        alSourcei (this->audioSource_, AL_LOOPING, (this->bLoop_ ? AL_TRUE : AL_FALSE));
+        this->setLooping(getLooping());
         if (this->isPlaying() || this->isPaused())
-            alSourcePlay(this->audioSource_);
+            BaseSound::play();
         if (this->isPaused())
-            alSourcePause(this->audioSource_);
-
-        if (int error = alGetError())
-            COUT(2) << "Sound: OpenAL: Error playing sound: " << error << std::endl;
+            BaseSound::pause();
     }
 }

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

@@ -96 +96 @@
             this->stop();
     }
-    
+
     float WorldSound::getVolumeGain()
     {