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

Timestamp:

Jun 4, 2005, 12:38:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the SoundEngine into the Trunk.
merged file by file, but merged all the files in favor of the new trunk

File:

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

orxonox/trunk/src/orxonox.cc

@@ -33 +33 @@
 #include "game_loader.h"
 #include "graphics_engine.h"
+#include "sound_engine.h"
 #include "resource_manager.h"
 #include "object_manager.h"
@@ -72 +73 @@
   Orxonox::singletonRef = NULL;
   delete GraphicsEngine::getInstance(); // deleting the Graphics
+  delete TextEngine::getInstance();
+  delete SoundEngine::getInstance();
   delete ResourceManager::getInstance(); // deletes the Resource Manager
   delete ObjectManager::getInstance();
@@ -121 +124 @@
   if( initVideo() == -1) return -1;
   if( initSound() == -1) return -1;
-  printf("> Initializing input\n");
+  PRINT(3)("> Initializing input\n");
   if( initInput() == -1) return -1;
-  printf("> Initializing networking\n");
+  PRINT(3)("> Initializing networking\n");
   if( initNetworking () == -1) return -1;
   //printf("> Initializing world\n");
@@ -149 +152 @@
 int Orxonox::initSound() 
 {
-  printf("> Initializing sound\n");
+  PRINT(3)("> Initializing sound\n");
   // SDL_Init(SDL_INIT_AUDIO);
-  printf("Not yet implemented\n");
+  SoundEngine::getInstance()->initAudio();
   return 0;
 }