Changeset 6332 for code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc

Timestamp:

Dec 13, 2009, 12:11:40 AM (14 years ago)

Author:

rgrieder

Message:

Improved SoundBuffer class design and removed its pooling property (just a boolean).

File:

• code/branches/presentation2/src/orxonox/sound/SoundBuffer.cc (modified) (5 diffs)

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

@@ -33 +33 @@
 #include <vorbis/vorbisfile.h>
 
+#include "util/Clock.h"
+#include "core/Game.h"
 #include "util/Exception.h"
 #include "util/StringUtils.h"
@@ -40 +42 @@
 namespace orxonox
 {
-    SoundBuffer::SoundBuffer(const std::string& filename)
+    SoundBuffer::SoundBuffer(const std::string& filename, std::list<shared_ptr<SoundBuffer> >::iterator poolIterator)
         : filename_(filename)
         , audioBuffer_(AL_NONE)
+        , poolIterator_(poolIterator)
     {
         if (this->filename_.empty())
@@ -60 +63 @@
         if (getLowercase(extension) == "ogg")
         {
+            int before = Game::getInstance().getGameClock().getRealMicroseconds();
             // Try ogg loader
             this->loadOgg(fileInfo, dataStream);
+            int after = Game::getInstance().getGameClock().getRealMicroseconds();
+            COUT(0) << filename << ": " << (after - before) << std::endl;
         }
         else
@@ -80 +86 @@
         ALint size;
         alGetBufferi(this->audioBuffer_, AL_SIZE, &size);
-        if (!alGetError())
-            return size;
-        else
-            return 0;
+        return alGetError() ? 0 : size;
     }
 
@@ -108 +111 @@
     {
         Ogre::DataStream* stream = static_cast<Ogre::DataStream*>(datasource);
-        int offset_beg = offset;
-        if (whence == SEEK_CUR)
-            offset_beg = stream->tell() + offset;
-        else if (whence == SEEK_END)
-            offset_beg = stream->size() + offset;
-        else if (whence != SEEK_SET)
+        switch (whence)
+        {
+        case SEEK_SET:
+            stream->seek(offset);
+            break;
+        case SEEK_CUR:
+            stream->skip(offset);
+            break;
+        case SEEK_END:
+            stream->seek(stream->size() + offset);
+            break;
+        default:
             return -1;
-        stream->seek(offset_beg);
+        }
         return 0;
     }