Changeset 2982 for code

Timestamp:

May 18, 2009, 3:38:22 PM (16 years ago)

Author:

erwin

Message:

added some error checking

Location:

code/branches/sound/src/orxonox

Files:

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

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

@@ -78 +78 @@
                 delete this->boostBlur_;
         }
+
+        if(this->sound_ != NULL)
+            delete this->sound_;
     }
 
@@ -222 +225 @@
     {
         this->ship_ = ship;
-        this->sound_->attachToEntity(ship);
+
+        if(this->sound_ != NULL)
+            this->sound_->attachToEntity(ship);
 
         if (ship)

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

@@ -64 +64 @@
             else
             {
-                COUT(3) << "OpenAL: Sound device opened";
+                COUT(3) << "OpenAL: Sound device opened" << std::endl;
                 this->context_ = alcCreateContext(SoundManager::device_s, NULL);
                 if(this->context_ == NULL)
                 {
-                    COUT(2) << "OpenAL: Could not create sound context";
+                    COUT(2) << "OpenAL: Could not create sound context" << std::endl;
                 }
                 else
                 {
-                    COUT(3) << "OpenAL: Context " << this->context_ << "loaded";
-                    alcMakeContextCurrent(this->context_);
+                    if(alcMakeContextCurrent(this->context_) == AL_TRUE)
+                        COUT(3) << "OpenAL: Context " << this->context_ << "loaded" << std::endl;
                 }
             }