Changeset 6827 in orxonox.OLD for trunk

Timestamp:

Jan 29, 2006, 2:10:48 PM (19 years ago)

Author:

bensch

Message:

trunk: Music should be loadable

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (3 diffs)
• story_entities/game_world.cc (modified) (2 diffs)
• story_entities/game_world_data.cc (modified) (2 diffs)
• story_entities/game_world_data.h (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -34 +34 @@
 {
   this->setClassID(CL_SOUND_OGG_PLAYER, "OggPlayer");
+
+  this->source = 0;
+
   if (fileName != NULL)
   {
@@ -70 +73 @@
     alGenBuffers(2, buffers);
     check();
-    alGenSources(1, &source);
+    SoundEngine::getInstance()->popALSource(this->source);
     check();
 
@@ -88 +91 @@
     alSourceStop(source);
     empty();
-    alDeleteSources(1, &source);
+    SoundEngine::getInstance()->pushALSource(source);
     check();
     alDeleteBuffers(1, buffers);

trunk/src/story_entities/game_world.cc

@@ -366 +366 @@
   PNode::getNullParent()->updateNode (this->dtS);
   SoundEngine::getInstance()->update();
-  //music->update();
+
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->update();
 }
 
@@ -435 +437 @@
 
   engine->draw();
-
-  /* final draw command */
 }
 

trunk/src/story_entities/game_world_data.cc

@@ -280 +280 @@
   LoadParamXML(root, "GraphicsEngine", GraphicsEngine::getInstance(), GraphicsEngine, loadParams);
 
+  LoadParam(root, "Music", this, GameWorldData, setSoundTrack);
+
 //  LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
   //LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
@@ -311 +313 @@
 void GameWorldData::setSoundTrack(const char* name)
 {
+  if (this->music != NULL)
+    delete this->music;
+
   PRINTF(3)("Setting Sound Track to %s\n", name);
   this->music = (OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);

trunk/src/story_entities/game_world_data.h

@@ -52 +52 @@
     virtual ErrorMessage unloadScene();
 
-
   public:
     GLMenuImageScreen*  glmis;                       //!< The Level-Loader Display