Changeset 6232

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.

Location:

code/branches/presentation2/src/orxonox/sound

Files:

• BaseSound.cc (modified) (1 diff)
• SoundBuffer.cc (modified) (3 diffs)
• SoundManager.cc (modified) (2 diffs)

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

@@ -170 +170 @@
 
         this->source_ = source;
-        if (source_.empty()) 
+        if (source_.empty())
             return;
 

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

@@ -81 +81 @@
 
         if (this->audioBuffer_ == AL_NONE)
-            ThrowException(General, "Sound: Standard file loader failed: " << alutGetErrorString(alutGetError()));
+            ThrowException(General, "Sound Error: Standard file loader failed: " << alutGetErrorString(alutGetError()));
     }
 
@@ -127 +127 @@
             COUT(2) << "Sound: libvorbisfile: File does not seem to be an Ogg Vorbis bitstream" << std::endl;
             ov_clear(&vf);
-            ThrowException(General, "Sound: Ogg file loader failed when opening the bitstream");
+            ThrowException(General, "Sound Error: Ogg file loader failed when opening the bitstream");
         }
 
@@ -143 +143 @@
                 COUT(2) << "Sound: libvorbisfile: error reading the file" << std::endl;
                 ov_clear(&vf);
-                ThrowException(General, "Sound: Ogg file loader failed when decoding the file");
+                ThrowException(General, "Sound Error: Ogg file loader failed when decoding the file");
             }
             else

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);
     }