Changeset 6234 for code/branches/presentation2/src

Timestamp:

Dec 3, 2009, 8:22:49 PM (15 years ago)

Author:

rgrieder

Message:

Fixed the sound bug where it didn't play when setting the source too late.
And fixed it again by moving setConfigValues in GSMainMenu.
Sound works for me now.

Location:

code/branches/presentation2/src/orxonox

Files:

• gamestates/GSMainMenu.cc (modified) (2 diffs)
• sound/BaseSound.cc (modified) (1 diff)

code/branches/presentation2/src/orxonox/gamestates/GSMainMenu.cc

@@ -101 +101 @@
         InputManager::getInstance().enterState("mainMenu");
 
+        this->setConfigValues();
+
         if (GameMode::playsSound())
         {
             this->ambient_->setLooping(true);
-            //this->ambient_->play(); // works without source
+            this->ambient_->play(); // works without source
         }
-
-        this->setConfigValues();
     }
 
@@ -141 +141 @@
         {
             this->ambient_->setAmbientSource(soundPathMain_);
-            this->ambient_->play();
         }
     }

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

@@ -197 +197 @@
         this->setLooping(getLooping());
         if (this->isPlaying() || this->isPaused())
-            BaseSound::play();
+        {
+            alSourcePlay(this->audioSource_);
+            if (int error = alGetError())
+                COUT(2) << "Sound: Error playing sound: " << error << std::endl;
+        }
         if (this->isPaused())
-            BaseSound::pause();
+            alSourcePause(this->audioSource_);
     }
 }