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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: Namespaces for sound

File:

• trunk/src/orxonox.cc (modified) (3 diffs)

trunk/src/orxonox.cc

@@ -131 +131 @@
   // engines
   delete CDEngine::getInstance();
-  delete SoundEngine::getInstance();
+  delete OrxSound::SoundEngine::getInstance();
   delete GraphicsEngine::getInstance(); // deleting the Graphics
   delete EventHandler::getInstance();
@@ -265 +265 @@
   PRINT(3)("> Initializing sound\n");
   // SDL_InitSubSystem(SDL_INIT_AUDIO);
-  SoundEngine::getInstance();
-
-  SoundEngine::getInstance()->loadSettings();
-  SoundEngine::getInstance()->initAudio();
+  OrxSound::SoundEngine::getInstance();
+
+  OrxSound::SoundEngine::getInstance()->loadSettings();
+  OrxSound::SoundEngine::getInstance()->initAudio();
   return 0;
 }
@@ -441 +441 @@
   else if ( Preferences::getInstance()->getString("misc", "bt-to-file", "1") == "1" )
   {      SignalHandler::getInstance()->doCatch( argv[0], GDB_RUN_WRITE_TO_FILE );
-    
-  }
-  
+
+  }
+
   if( Preferences::getInstance()->getString("game", "showGui", "") == "1" )
     showGui = true;