Changeset 3184

Timestamp:

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

Author:

rgrieder

Message:

Converted SoundManager into a more suitable singleton.

Location:

code/branches/pch/src/orxonox

Files:

• gamestates/GSGraphics.cc (modified) (5 diffs)
• gamestates/GSGraphics.h (modified) (1 diff)
• sound/SoundBase.cc (modified) (2 diffs)
• sound/SoundBase.h (modified) (1 diff)
• sound/SoundManager.cc (modified) (3 diffs)
• sound/SoundManager.h (modified) (3 diffs)

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

code/branches/pch/src/orxonox/sound/SoundBase.cc

@@ -41 +41 @@
 namespace orxonox 
 {
-    SoundManager* SoundBase::soundmanager_s = NULL;
-
     SoundBase::SoundBase(WorldEntity* entity)
     {
-        if(SoundBase::soundmanager_s == NULL)
-        {
-            SoundBase::soundmanager_s = new SoundManager();
-        }
-
         this->source_ = 0;
         this->buffer_ = 0;
         this->entity_ = entity;
 
-        SoundBase::soundmanager_s->addSound(this);
+        SoundManager::getInstance().addSound(this);
     }
 
@@ -144 +137 @@
         filename = Core::getMediaPathString() + "/audio/" + filename;
 
-        if(!SoundBase::soundmanager_s->isSoundAvailable())
+        if(!SoundManager::getInstance().isSoundAvailable())
         {
             COUT(3) << "Sound: not available, skipping " << filename << std::endl;

code/branches/pch/src/orxonox/sound/SoundBase.h

@@ -64 +64 @@
 
         ALint getSourceState();
-
-        static SoundManager* soundmanager_s;
     }; // class SoundBase
 } // namepsace orxonox

code/branches/pch/src/orxonox/sound/SoundManager.cc

@@ -38 +38 @@
 namespace orxonox
 {
+    SoundManager* SoundManager::singletonRef_s = NULL;
     ALCdevice* SoundManager::device_s = NULL;
 
@@ -45 +46 @@
     SoundManager::SoundManager()
     {
+        assert(singletonRef_s == NULL);
+        singletonRef_s = this;
+
         this->soundavailable_ = true;
         if(!alutInitWithoutContext(NULL,NULL))
@@ -91 +95 @@
     SoundManager::~SoundManager()
     {
+        assert(singletonRef_s != NULL);
+        singletonRef_s = NULL;
+
         alcDestroyContext(this->context_);
         alcCloseDevice(SoundManager::device_s);

code/branches/pch/src/orxonox/sound/SoundManager.h

@@ -30 +30 @@
 #include "OrxonoxPrereqs.h"
 
+#include <cassert>
 #include <list>
 #include "interfaces/Tickable.h"
@@ -51 +52 @@
         bool isSoundAvailable();
 
+        static SoundManager& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
+
     private:
         static ALCdevice* device_s;
@@ -57 +60 @@
         bool soundavailable_;
 
+        static SoundManager* singletonRef_s;
     }; // class SoundManager
 } // namespace orxonox