Changeset 6255 for code/branches

Timestamp:

Dec 6, 2009, 5:02:56 PM (15 years ago)

Author:

rgrieder

Message:

Temporarily resolved problem of sounds only playing once.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (2 diffs)
• BaseSound.h (modified) (1 diff)

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

@@ -76 +76 @@
     void BaseSound::play()
     {
-        if (!this->isPlaying() && GameMode::showsGraphics())
-        {
-            this->state_ = Playing;
+        this->state_ = Playing;
+        if (GameMode::playsSound() && this->getSourceState() != AL_PLAYING)
+        {
             alSourcePlay(this->audioSource_);
 
@@ -100 +100 @@
         if (GameMode::playsSound())
             alSourcePause(this->audioSource_);
+    }
+
+    ALint BaseSound::getSourceState() const
+    {
+        if (GameMode::playsSound())
+        {
+            ALint state;
+            alGetSourcei(this->audioSource_, AL_SOURCE_STATE, &state);
+            return state;
+        }
+        else
+            return AL_INITIAL;
     }
 

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

@@ -84 +84 @@
 
     protected:
-        ALuint loadOggFile();
+        ALint getSourceState() const;
 
         ALuint          audioSource_;