Changeset 7318 in orxonox.OLD for trunk/src/lib/sound

Timestamp:

Apr 17, 2006, 2:55:51 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: SoundSource in the Menu

Location:

trunk/src/lib/sound

Files:

• sound_engine.cc (modified) (3 diffs)
• sound_engine.h (modified) (1 diff)
• sound_source.cc (modified) (1 diff)

trunk/src/lib/sound/sound_engine.cc

@@ -124 +124 @@
  * @param sourceNode The sourceNode to bind this SoundSource to.
  * @returns The newly created SoundSource
-
-   acctualy this is nothing more than a wrapper around the ResourceManager.
+ *
+ * acctualy this is nothing more than a wrapper around the ResourceManager.
 */
 SoundSource* SoundEngine::createSource(const std::string& fileName, PNode* sourceNode)
 {
-  return new SoundSource(sourceNode, (SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL));
+  SoundBuffer* buffer = NULL;
+  if (!fileName.empty())
+  {
+     buffer= (SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL);
+     if (buffer == NULL)
+       PRINTF(2)("Wav-Sound %s could not be loaded onto new Source\n", fileName.c_str());
+  }
+    return new SoundSource(sourceNode, buffer);
 }
 
@@ -151 +158 @@
  * @param source the Source to fill with the Value.
  */
-bool SoundEngine::popALSource(ALuint& source)
+void SoundEngine::popALSource(ALuint& source)
 {
   assert (source == 0);
-
   /// @TODO try to create more sources if needed
   if (!this->ALSources.empty())
@@ -162 +168 @@
     this->ALSources.pop();
     SDL_mutexV(this->sourceMutex);
-    return true;
-  }
-  else
-    return false;
+  }
 }
 

trunk/src/lib/sound/sound_engine.h

@@ -49 +49 @@
 
   // administrative
-    bool popALSource(ALuint& source);
+    void popALSource(ALuint& source);
     void pushALSource(ALuint& source);
 

trunk/src/lib/sound/sound_source.cc

@@ -117 +117 @@
 void SoundSource::play()
 {
-  if (this->retrieveSource())
-  {
-    alSourcePlay(this->sourceID);
+  if (this->buffer && this->retrieveSource())
+  {
+    if (this->bPlay)
+      alSourceStop(this->sourceID);
+    alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+      alSourcePlay(this->sourceID);
+
     if (DEBUG >= 3)
       SoundEngine::checkError("Play Source", __LINE__);