Changeset 6232 for code/branches/presentation2/src/orxonox/sound/SoundManager.cc

Timestamp:

Dec 3, 2009, 7:48:42 PM (14 years ago)

Author:

rgrieder

Message:

Fixed two problems in the sound system: Buffers did not get removed from the list in the SoundManager and failed creation was not caught.

File:

• code/branches/presentation2/src/orxonox/sound/SoundManager.cc (modified) (2 diffs)

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

@@ -484 +484 @@
         else
         {
-            shared_ptr<SoundBuffer> buffer(new SoundBuffer(fileInfo));
+            shared_ptr<SoundBuffer> buffer;
+            try
+            {
+                buffer.reset(new SoundBuffer(fileInfo));
+            }
+            catch (...)
+            {
+                COUT(1) << Exception::handleMessage() << std::endl;
+                return shared_ptr<SoundBuffer>();
+            }
             this->soundBuffers_[fileInfo->group + '/' + fileInfo->filename] = buffer;
             return buffer;
@@ -494 +503 @@
         std::map<std::string, weak_ptr<SoundBuffer> >::iterator it
             = this->soundBuffers_.find(fileInfo->group + '/' + fileInfo->filename);
-        if (it == this->soundBuffers_.end())
+        if (it != this->soundBuffers_.end())
             this->soundBuffers_.erase(it);
     }