Changeset 5904

Timestamp:

Oct 8, 2009, 12:00:21 AM (15 years ago)

Author:

rgrieder

Message:

Ogg file loading should work again now using the Ogre resource system.

Location:

code/branches/core5/src/orxonox/sound

Files:

• BaseSound.cc (modified) (5 diffs)
• BaseSound.h (modified) (3 diffs)

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

@@ -132 +132 @@
             return;
         }
-        DataStreamPtr stream = Resource::open(source);
+        dataStream_ = Resource::open(source);
         // Read everything into a temporary buffer
         char* buffer = new char[fileInfo->size];
-        stream->read(buffer, fileInfo->size);
+        dataStream_->read(buffer, fileInfo->size);
+        dataStream_->seek(0);
 
         this->audioBuffer_ = alutCreateBufferFromFileImage(buffer, fileInfo->size);
@@ -143 +144 @@
         {
             COUT(2) << "Sound: OpenAL ALUT: " << alutGetErrorString(alutGetError()) << std::endl;
-            return;
-            //if (filename.find("ogg", 0) != std::string::npos)
-            //{
-            //    COUT(2) << "Sound: Trying fallback ogg loader" << std::endl;
-            //    this->audioBuffer_ = loadOggFile(filename);
-            //}
-
-            //if (this->audioBuffer_ == AL_NONE)
-            //{
-            //    COUT(2) << "Sound: fallback ogg loader failed: " << alutGetErrorString(alutGetError()) << std::endl;
-            //    return;
-            //}
+            if (source.find("ogg", 0) != std::string::npos)
+            {
+                COUT(2) << "Sound: Trying fallback ogg loader" << std::endl;
+                this->audioBuffer_ = loadOggFile();
+            }
+
+            if (this->audioBuffer_ == AL_NONE)
+            {
+                COUT(2) << "Sound: fallback ogg loader failed: " << alutGetErrorString(alutGetError()) << std::endl;
+                return;
+            }
         }
 
@@ -178 +178 @@
     }
 
-#if 0 // Not yet supported because of missing resource implementation
-    ALuint BaseSound::loadOggFile(const std::string& filename)
+    size_t readVorbis(void* ptr, size_t size, size_t nmemb, void* datasource)
+    {
+        return static_cast<Ogre::DataStream*>(datasource)->read(ptr, size * nmemb);
+    }
+
+    int seekVorbis(void* datasource, ogg_int64_t offset, int whence)
+    {
+        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)
+            return -1;
+        stream->seek(offset_beg);
+        return 0;
+    }
+
+    long tellVorbis(void* datasource)
+    {
+        return static_cast<long>(static_cast<Ogre::DataStream*>(datasource)->tell());
+    }
+
+    ALuint BaseSound::loadOggFile()
     {
         char inbuffer[4096];
@@ -190 +213 @@
         ALenum format;
 
-        FILE* f = fopen(filename.c_str(), "rb");
-
-        if (ov_open(f, &vf, NULL, 0) < 0)
+        // Open file with custom streaming
+        ov_callbacks vorbisCallbacks;
+        vorbisCallbacks.read_func  = &readVorbis;
+        vorbisCallbacks.seek_func  = &seekVorbis;
+        vorbisCallbacks.tell_func  = &tellVorbis;
+        vorbisCallbacks.close_func = NULL;
+
+        int ret = ov_open_callbacks(dataStream_.get(), &vf, NULL, 0, vorbisCallbacks);
+        if (ret < 0)
         {
             COUT(2) << "Sound: libvorbisfile: File does not seem to be an Ogg Vorbis bitstream" << std::endl;
@@ -230 +259 @@
         return buffer;
     }
-#endif
 
 } // namespace: orxonox

code/branches/core5/src/orxonox/sound/BaseSound.h

@@ -32 +32 @@
 
 #include <string>
+#include <OgreSharedPtr.h>
+#include <OgreDataStream.h>
 #include "core/OrxonoxClass.h"
 
@@ -65 +67 @@
 
     protected:
-        ALuint loadOggFile(const std::string& filename);
+        ALuint loadOggFile();
         ALint getSourceState();
 
@@ -75 +77 @@
         bool bPlayOnLoad_;
         bool bLoop_;
+        DataStreamPtr dataStream_;
     };
 }