Changeset 3236 for code/branches/core4/src

Timestamp:

Jun 28, 2009, 1:42:54 PM (15 years ago)

Author:

rgrieder

Message:

Fixed a bug in SoundManager: Construction, destruction and construction again failed due to a static variable that now is a member.

Location:

code/branches/core4/src/orxonox/sound

Files:

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

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

@@ -39 +39 @@
 {
     SoundManager* SoundManager::singletonRef_s = NULL;
-    ALCdevice* SoundManager::device_s = NULL;
 
     /**
@@ -49 +48 @@
         singletonRef_s = this;
 
+        this->device_ = NULL;
         this->soundavailable_ = true;
         if(!alutInitWithoutContext(NULL,NULL))
@@ -57 +57 @@
         else
         {
-            if(SoundManager::device_s == NULL)
-            {
-                COUT(3) << "Sound: OpenAL: Open sound device..." << std::endl;
-                SoundManager::device_s = alcOpenDevice(NULL);
-            }
+            assert(this->device_ == NULL);
+            COUT(3) << "Sound: OpenAL: Open sound device..." << std::endl;
+            this->device_ = alcOpenDevice(NULL);
 
-            if(SoundManager::device_s == NULL)
+            if(this->device_ == NULL)
             {
                 COUT(2) << "Sound: OpenAL: Could not open sound device" << std::endl;
@@ -71 +69 @@
             {
                 COUT(3) << "Sound: OpenAL: Sound device opened" << std::endl;
-                this->context_ = alcCreateContext(SoundManager::device_s, NULL);
+                this->context_ = alcCreateContext(this->device_, NULL);
                 if(this->context_ == NULL)
                 {
@@ -99 +97 @@
 
         alcDestroyContext(this->context_);
-        alcCloseDevice(SoundManager::device_s);
+        alcCloseDevice(this->device_);
         alutExit();
     }

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

@@ -55 +55 @@
 
     private:
-        static ALCdevice* device_s;
+        ALCdevice* device_;
         ALCcontext* context_;
         std::list<SoundBase*> soundlist_;