Changeset 7460 in orxonox.OLD for trunk/src/story_entities

Timestamp:

May 1, 2006, 12:30:34 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Namespaces for sound

Location:

trunk/src/story_entities

Files:

• game_world.cc (modified) (1 diff)
• game_world_data.cc (modified) (2 diffs)
• game_world_data.h (modified) (2 diffs)
• simple_game_menu.cc (modified) (1 diff)
• simple_game_menu.h (modified) (2 diffs)

trunk/src/story_entities/game_world.cc

@@ -400 +400 @@
   GraphicsEngine::getInstance()->update(this->dtS);
   PNode::getNullParent()->updateNode (this->dtS);
-  SoundEngine::getInstance()->update();
+  OrxSound::SoundEngine::getInstance()->update();
 }
 

trunk/src/story_entities/game_world_data.cc

@@ -335 +335 @@
   if( this->sky != NULL)
     this->localCamera->addChild(this->sky);
-  SoundEngine::getInstance()->setListener(this->localCamera);
+  OrxSound::SoundEngine::getInstance()->setListener(this->localCamera);
 }
 
@@ -366 +366 @@
     PRINTF(3)("Setting Sound Track to %s\n", name.c_str());
     std::string oggFile = ResourceManager::getFullName(name);
-    this->music = new OggPlayer(oggFile);
+    this->music = new OrxSound::OggPlayer(oggFile);
 
     //(OggPlayer*)ResourceManager::getInstance()->load(name, OGG, RP_LEVEL);

trunk/src/story_entities/game_world_data.h

@@ -19 +19 @@
 class GLMenuImageScreen;
 
-class OggPlayer;
+namespace OrxSound {class OggPlayer;}
 class GameRules;
 
@@ -59 +59 @@
     Terrain*                      terrain;        //!< The terrain - ground
 
-    OggPlayer*                    music;          //!< Reference to the SoundEngine's music player (OggPlayer)
+    OrxSound::OggPlayer*          music;          //!< Reference to the SoundEngine's music player (OggPlayer)
     ObjectManager*                objectManager;  //!< Reference to the objects manager
 

trunk/src/story_entities/simple_game_menu.cc

@@ -248 +248 @@
 void SimpleGameMenu::setSelectorSound(const std::string& selectorSound)
 {
-  this->selectorSource = SoundEngine::getInstance()->createSource(selectorSound, NULL);
+  this->selectorSource = OrxSound::SoundEngine::getInstance()->createSource(selectorSound, NULL);
 }
 

trunk/src/story_entities/simple_game_menu.h

@@ -20 +20 @@
 class TiXmlElement;
 class ImageEntity;
-class SoundSource;
 
-
+namespace OrxSound { class SoundSource; }
 
 class MenuLayer
@@ -89 +88 @@
     Vector                            cameraVector;
 
-    SoundSource*                      selectorSource;
+    OrxSound::SoundSource*            selectorSource;
 };