Changeset 3184 for code/branches/pch/src/orxonox/gamestates

Timestamp:

Jun 15, 2009, 11:45:29 PM (16 years ago)

Author:

rgrieder

Message:

Converted SoundManager into a more suitable singleton.

Location:

code/branches/pch/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (5 diffs)
• GSGraphics.h (modified) (1 diff)

code/branches/pch/src/orxonox/gamestates/GSGraphics.cc

@@ -52 +52 @@
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
+#include "sound/SoundManager.h"
 #include "GraphicsManager.h"
 
@@ -64 +65 @@
         , guiManager_(0)
         , graphicsManager_(0)
+        , soundManager_(0)
         , masterKeyBinder_(0)
         , masterInputState_(0)
@@ -95 +97 @@
         \li creates input manager
         \li loads master key bindings
+        \li loads the SoundManager
         \li loads ingame console
         \li loads GUI interface (GUIManager)
@@ -128 +131 @@
         masterKeyBinder_->loadBindings("masterKeybindings.ini");
         masterInputState_->setKeyHandler(masterKeyBinder_);
+
+        // Load the SoundManager
+        soundManager_ = new SoundManager();
 
         // Load the InGameConsole
@@ -173 +179 @@
         delete this->debugOverlay_;
 
+        delete this->soundManager_;
+
         delete this->inputManager_;
         this->inputManager_ = 0;

code/branches/pch/src/orxonox/gamestates/GSGraphics.h

@@ -72 +72 @@
         GUIManager*           guiManager_;          //!< Interface to GUI
         GraphicsManager*      graphicsManager_;     //!< Interface to Ogre
+        SoundManager*         soundManager_;        //!< Keeps track of SoundBase objects
 
         KeyBinder*            masterKeyBinder_;     //!< Key binder for master key bindings