Changeset 7318 in orxonox.OLD for trunk/src

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: SoundSource in the Menu

Location:

trunk/src

Files:

• lib/sound/sound_engine.cc (modified) (3 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• lib/sound/sound_source.cc (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (7 diffs)
• story_entities/simple_game_menu.h (modified) (3 diffs)

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__);

trunk/src/story_entities/simple_game_menu.cc

@@ -35 +35 @@
 #include "graphics_engine.h"
 #include "object_manager.h"
-
+#include "sound_engine.h"
+#include "sound_source.h"
 
 #include "cd_engine.h"
@@ -62 +63 @@
   this->layerIndex = 0;
   this->menuSelectedIndex = 0;
+  this->selectorSource = NULL;
 
   if (root != NULL)
@@ -134 +136 @@
   if (this->dataXML != NULL)
   {
+    LoadParam(dataXML, "selector-sound", this, SimpleGameMenu, setSelectorSound);
+
     TiXmlElement* element = this->dataXML->FirstChildElement("Elements");
+
 
     if( element == NULL)
@@ -237 +242 @@
 }
 
+/**
+ * @brief set the Sound to play when switching menu entry.
+ * @param selectorSound the sound to load.
+ */
+void SimpleGameMenu::setSelectorSound(const std::string& selectorSound)
+{
+  this->selectorSource = SoundEngine::getInstance()->createSource(selectorSound, NULL);
+  printf("=============== %s\n", selectorSound.c_str());
+}
 
 ErrorMessage SimpleGameMenu::unloadData()
@@ -257 +271 @@
   }
 
+  // delete the SoundSource.
+  if (this->selectorSource != NULL)
+    delete this->selectorSource;
+  this->selectorSource = NULL;
 
   GameWorld::unloadData();
@@ -375 +393 @@
       this->menuSelected = this->menuLayers[this->layerIndex].menuList[++this->menuSelectedIndex];
       this->sliderTo(this->menuSelected, 5.0f);
+      if (this->selectorSource != NULL)
+        this->selectorSource->play();
 
       if( this->layerIndex == 1)
@@ -389 +409 @@
       this->menuSelected = this->menuLayers[this->layerIndex].menuList[--this->menuSelectedIndex];
       this->sliderTo(this->menuSelected, 5.0f);
+      if (this->selectorSource != NULL)
+        this->selectorSource->play();
 
       if( this->layerIndex == 1)

trunk/src/story_entities/simple_game_menu.h

@@ -20 +20 @@
 class TiXmlElement;
 class ImageEntity;
+class SoundSource;
 
 
@@ -70 +71 @@
     void switchMenuLayer(int layer1, int layer2);
     void sliderTo(const Element2D* element, float bias = 0.0f);
+    void setSelectorSound(const std::string& selectorSound);
 
 
@@ -86 +88 @@
 
     Vector                            cameraVector;
+
+    SoundSource*                      selectorSource;
 };