Changeset 2998 for code/branches/sound

Timestamp:

May 20, 2009, 8:31:23 PM (16 years ago)

Author:

erwin

Message:

fixed some bugs

Location:

code/branches/sound/src/orxonox

Files:

• objects/items/Engine.cc (modified) (2 diffs)
• sound/SoundBase.cc (modified) (1 diff)
• sound/SoundManager.cc (modified) (4 diffs)
• sound/SoundManager.h (modified) (2 diffs)

code/branches/sound/src/orxonox/objects/items/Engine.cc

@@ -226 +226 @@
         this->ship_ = ship;
 
-        if(this->sound_ != NULL)
-            this->sound_->attachToEntity(ship);
-
         if (ship)
         {
@@ -240 +237 @@
                 this->boostBlur_ = 0;
             }
+
+            if(this->sound_ != NULL)
+                this->sound_->attachToEntity(ship);
         }
     }

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

@@ -134 +134 @@
     bool SoundBase::loadFile(std::string filename) {
         filename = Core::getMediaPathString() + "/audio/" + filename;
+
+        if(!SoundBase::soundmanager_s->isSoundAvailable())
+        {
+            COUT(3) << "Sound: not available, skipping " << filename << std::endl;
+            return false;
+        }
+
         COUT(3) << "Sound: OpenAL ALUT: loading file " << filename << std::endl;
         this->buffer_ = alutCreateBufferFromFile(filename.c_str());

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

@@ -44 +44 @@
     SoundManager::SoundManager()
     {
+        this->soundavailable_ = true;
         if(!alutInitWithoutContext(NULL,NULL))
         {
             COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
+            this->soundavailable_ = false;
         }
         else
@@ -61 +63 @@
             {
                 COUT(2) << "Sound: OpenAL: Could not open sound device" << std::endl;
+                this->soundavailable_ = false;
             }
             else
@@ -69 +72 @@
                 {
                     COUT(2) << "Sound: OpenAL: Could not create sound context" << std::endl;
+                    this->soundavailable_ = false;
                 }
                 else
@@ -146 +150 @@
             (*i)->update();
     }
+    
+    /**
+    * Check if sound is available
+    */
+    bool SoundManager::isSoundAvailable()
+    {
+        return this->soundavailable_;
+    }
 }

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

@@ -50 +50 @@
         void addSound(SoundBase* sound);
         void removeSound(SoundBase* sound);
-
         virtual void tick(float dt);
+        bool isSoundAvailable();
 
     private:
@@ -57 +57 @@
         ALCcontext* context_;
         std::list<SoundBase*> soundlist_;
+        bool soundavailable_;
 
     }; // class SoundManager