Changeset 8969 in orxonox.OLD

Timestamp:

Jul 1, 2006, 10:45:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ogg-files loadable (hopefully)

Location:

trunk/src/lib/sound

Files:

• sound_buffer.cc (modified) (4 diffs)
• sound_buffer.h (modified) (1 diff)
• sound_source.cc (modified) (3 diffs)

trunk/src/lib/sound/sound_buffer.cc

@@ -23 +23 @@
 #include <cassert>
 #include "debug.h"
+#include "sys/stat.h"
+#include "helper_functions.h"
 
 #ifdef HAVE_SDL_SDL_H
@@ -48 +50 @@
     alGenBuffers(1, &this->bufferID);
     SoundEngine::checkError("Generate Buffer", __LINE__);
-    this->loadWAV(fileName);
+    if (!nocaseCmp(fileName.substr(fileName.size() - 3), "WAV"))
+    {
+      this->loadWAV(fileName);
+    }
+    else if (!nocaseCmp(fileName.substr(fileName.size() - 3), "OGG"))
+      this->loadOGG(fileName);
+
   }
 
@@ -76 +84 @@
     }
 #if SDL_BYTEORDER == SDL_BIG_ENDIAN
-                if ( !( wavSpec.format == AUDIO_U8 || wavSpec.format == AUDIO_S8 ) ) {
-                        int cnt = wavLength/2;
-                        Uint16* wavBufferAsShorts = ( Uint16* )wavBuffer;
-                        for ( int i = 0; i < cnt; ++i, ++wavBufferAsShorts )
-                                *wavBufferAsShorts = SDL_Swap16( *wavBufferAsShorts );
-                }
+    if ( !( wavSpec.format == AUDIO_U8 || wavSpec.format == AUDIO_S8 ) )
+    {
+      int cnt = wavLength/2;
+      Uint16* wavBufferAsShorts = ( Uint16* )wavBuffer;
+      for ( int i = 0; i < cnt; ++i, ++wavBufferAsShorts )
+        *wavBufferAsShorts = SDL_Swap16( *wavBufferAsShorts );
+    }
 #endif
     alBufferData(this->bufferID, SoundBuffer::sdlAudioSpecToAlFormat(&wavSpec),
-                        wavBuffer, wavLength, wavSpec.freq);
+                 wavBuffer, wavLength, wavSpec.freq);
 
     SDL_FreeWAV(wavBuffer);
@@ -92 +101 @@
       return false;
   }
+
+
+#ifndef AL_FORMAT_VORBIS_EXT
+#define AL_FORMAT_VORBIS_EXT 0x100030
+#endif
+  bool SoundBuffer::loadOGG(const std::string& fileName)
+  {
+    void*     ovdata;
+    FILE*     fh;
+
+    fh = fopen( fileName.c_str() , "rb") ;
+    if( fh != NULL )
+    {
+      struct stat sbuf ;
+
+      if(stat( fileName.c_str(), &sbuf ) != -1)
+      {
+        ovdata = malloc(sbuf.st_size);
+        if(ovdata != NULL)
+        {
+          fread( ovdata, 1, sbuf.st_size, fh);
+
+          alBufferData( this->bufferID,
+                        AL_FORMAT_VORBIS_EXT,
+                        ovdata,
+                        sbuf.st_size,
+                        1) ;
+
+          free(ovdata);
+        }
+        fclose(fh);
+      }
+      else
+        return false;
+    }
+    else
+      return false;
+
+    return true ;
+
+  }
+
 
   /**

trunk/src/lib/sound/sound_buffer.h

@@ -23 +23 @@
 
     bool loadWAV(const std::string& fileName);
+    bool loadOGG(const std::string& fileName);
 
     /** @returns the ID of the buffer used in this SoundBuffer */

trunk/src/lib/sound/sound_source.cc

@@ -1 +1 @@
 /*
   orxonox - the future of 3D-vertical-scrollers
- 
+
   Copyright (C) 2004 orx
- 
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2, or (at your option)
   any later version.
- 
+
   ### File Specific:
   main-programmer: Benjamin Grauer
@@ -85 +85 @@
     else
       this->stop();
+
+    return *this;
   }
 
@@ -166 +168 @@
    * @brief Plays back buffer on this Source with gain
    * @param buffer the buffer to play back on this Source
-   * @param gain the gain of the sound buffer 
+   * @param gain the gain of the sound buffer
   */
   void SoundSource::play(const SoundBuffer* buffer, float gain)