Changeset 3184 for code/branches/pch/src/orxonox/sound/SoundBase.cc

Timestamp:

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

Author:

rgrieder

Message:

Converted SoundManager into a more suitable singleton.

File:

• code/branches/pch/src/orxonox/sound/SoundBase.cc (modified) (2 diffs)

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;