Changeset 9869 in orxonox.OLD for trunk/src/lib/sound/sound_buffer.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/lib/sound/sound_buffer.cc (modified) (1 diff)

trunk/src/lib/sound/sound_buffer.cc

@@ -18 +18 @@
 #include "sound_buffer.h"
 
-#include "sound_engine.h"
 
-#include "sdlincl.h"
-#include <cassert>
-#include "debug.h"
-#include "sys/stat.h"
-#include "helper_functions.h"
-
-#ifdef HAVE_SDL_SDL_H
-#include <SDL/SDL.h>
-#include <SDL/SDL_endian.h>
-#else
-#include <SDL.h>
-#include <SDL_endian.h>
-#endif
 namespace OrxSound
 {
+  ObjectListDefinition(SoundBuffer);
   //////////////////
   /* SOUND-BUFFER */
   //////////////////
+  SoundBuffer::SoundBuffer()
+      : data(new SoundBufferData)
+  {
+    this->registerObject(this, SoundBuffer::_objectList);
+  }
   /**
-   *  Creates a Soundbuffer out of an inputfile
+   * @brief Creates a Soundbuffer out of an inputfile
    * @param fileName The name of the File
    */
   SoundBuffer::SoundBuffer(const std::string& fileName)
+      : data(new SoundBufferData)
   {
-    this->setClassID(CL_SOUND_BUFFER, "SoundBuffer");
-    this->setName(fileName);
+    this->registerObject(this, SoundBuffer::_objectList);
+    this->load(fileName);
+  }
 
-    // generate a Buffer
-    alGenBuffers(1, &this->bufferID);
-    SoundEngine::checkError("Generate Buffer", __LINE__);
-    if (!nocaseCmp(fileName.substr(fileName.size() - 3), "WAV"))
-    {
-      this->loadWAV(fileName);
-    }
-    else if (!nocaseCmp(fileName.substr(fileName.size() - 3), "OGG"))
-      this->loadOGG(fileName);
+  SoundBuffer::SoundBuffer(const SoundBuffer& buffer)
+      : data(buffer.data)
+  {
+    this->registerObject(this, SoundBuffer::_objectList);
+  }
 
-  }
+  SoundBuffer::SoundBuffer(const SoundBufferData::Pointer& dataPointer)
+      : data(dataPointer)
+  {
+    this->registerObject(this, SoundBuffer::_objectList);
+  };
 
   SoundBuffer::~SoundBuffer()
   {
-    //  SoundEngine::getInstance()->removeBuffer(this);
-    alDeleteBuffers(1, &this->bufferID);
-    SoundEngine::checkError("SoundBuffer: Delete Buffer", __LINE__);
   }
 
-  /**
-   * @brief loads a Waveform from the local fileSystem into this Source.
-   * @param fileName the Name of the File to Load.
-   * @returns true on success.
-   */
-  bool SoundBuffer::loadWAV(const std::string& fileName)
-  {
-    SDL_AudioSpec wavSpec;
-    Uint32 wavLength;
-    Uint8 *wavBuffer;
-
-    /* Load the WAV */
-    if( SDL_LoadWAV(fileName.c_str(), &wavSpec, &wavBuffer, &wavLength) == NULL)
-    {
-      PRINTF(2)("Could not open %s: %s\n", fileName.c_str(), SDL_GetError());
-      return false;
-    }
-#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 );
-    }
-#endif
-    alBufferData(this->bufferID, SoundBuffer::sdlAudioSpecToAlFormat(&wavSpec),
-                 wavBuffer, wavLength, wavSpec.freq);
-
-    SDL_FreeWAV(wavBuffer);
-    if (SoundEngine::checkError("Could not load Wave file", __LINE__))
-      return true;
-    else
-      return false;
-  }
-
-
-#ifndef AL_FORMAT_VORBIS_EXT
-#define AL_FORMAT_VORBIS_EXT 0x100030
-#endif
-  /**
-   * @brief loads an OGG-file into a SOundBuffer
-   * @param fileName the Name of the File to load.
-   * @returns true on success (file exists and is fully loaded), false otherwise.
-   */
-  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) ;
-          SoundEngine::checkError("Could not load OGG file", __LINE__);
-
-          free(ovdata);
-        }
-        fclose(fh);
-      }
-      else
-        return false;
-    }
-    else
-      return false;
-
-    return true ;
-
-  }
-
-
-  /**
-   * @brief converts an SDL_AudioSpec into a valid OpenAL AUDIO_FORMAT enumerator
-   * @param audiospec the AudioSpec to convert.
-   * @returns the AL_FORMAT
-   */
-  ALenum SoundBuffer::sdlAudioSpecToAlFormat(const SDL_AudioSpec* audiospec)
-  {
-    assert (audiospec != NULL);
-    bool stereo = true;
-    bool is16Bit = true;
-    if (audiospec->format == AUDIO_U8 || audiospec->format == AUDIO_S8)
-      is16Bit = false;
-    if (audiospec->channels == 1)
-      stereo = false;
-
-    if (!stereo && !is16Bit)
-      return AL_FORMAT_MONO8;
-    else if (!stereo && is16Bit)
-      return AL_FORMAT_MONO16;
-    else if (stereo && !is16Bit)
-      return AL_FORMAT_STEREO8;
-    else /* if (stereo && is16Bit) */
-      return AL_FORMAT_STEREO16;
-  }
 }