Changeset 9803 in orxonox.OLD for branches/new_class_id/src/lib/sound/sound_buffer_data.cc

Timestamp:

Sep 24, 2006, 12:58:19 PM (18 years ago)

Author:

bensch

Message:

Ported SoundBuffer to match the Data-Paradigm

File:

• branches/new_class_id/src/lib/sound/sound_buffer_data.cc (copied) (copied from branches/new_class_id/src/lib/sound/sound_buffer.cc) (6 diffs)

branches/new_class_id/src/lib/sound/sound_buffer_data.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_SOUND
 
-#include "sound_buffer.h"
+#include "sound_buffer_data.h"
 
 #include "sound_engine.h"
@@ -35 +35 @@
 namespace OrxSound
 {
-  ObjectListDefinition(SoundBuffer);
+  ObjectListDefinition(SoundBufferData);
   //////////////////
   /* SOUND-BUFFER */
   //////////////////
   /**
-   *  Creates a Soundbuffer out of an inputfile
+   * @brief Creates a SoundbufferData out of an inputfile
    * @param fileName The name of the File
    */
-  SoundBuffer::SoundBuffer(const std::string& fileName)
+  SoundBufferData::SoundBufferData()
   {
-    this->registerObject(this, SoundBuffer::_objectList);
-    this->setName(fileName);
+    this->registerObject(this, SoundBufferData::_objectList);
+    this->bufferID = 0;
 
-    // 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);
+    this->size = 0;
+    this->loop = AL_FALSE;
+
 
   }
 
-  SoundBuffer::~SoundBuffer()
+  SoundBufferData::~SoundBufferData()
   {
     //  SoundEngine::getInstance()->removeBuffer(this);
@@ -68 +62 @@
 
   /**
+   * @brief check the File-extension and loads either Wav of Ogg
+   * @param fileName the Name of the File to load.
+   * @returns true on success (file found, and loaded.)
+   */
+  bool SoundBufferData::load(const std::string& fileName)
+  {
+    // generate a Buffer
+    alGenBuffers(1, &this->bufferID);
+    SoundEngine::checkError("Generate Buffer", __LINE__);
+    if (!nocaseCmp(fileName.substr(fileName.size() - 3), "WAV"))
+    {
+      return this->loadWAV(fileName);
+    }
+    else if (!nocaseCmp(fileName.substr(fileName.size() - 3), "OGG"))
+      return this->loadOGG(fileName);
+    else
+      return false;
+  }
+
+  /**
    * @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)
+  bool SoundBufferData::loadWAV(const std::string& fileName)
   {
     SDL_AudioSpec wavSpec;
@@ -93 +107 @@
     }
 #endif
-    alBufferData(this->bufferID, SoundBuffer::sdlAudioSpecToAlFormat(&wavSpec),
+    alBufferData(this->bufferID, SoundBufferData::sdlAudioSpecToAlFormat(&wavSpec),
                  wavBuffer, wavLength, wavSpec.freq);
 
@@ -112 +126 @@
    * @returns true on success (file exists and is fully loaded), false otherwise.
    */
-  bool SoundBuffer::loadOGG(const std::string& fileName)
+  bool SoundBufferData::loadOGG(const std::string& fileName)
   {
     void*     ovdata;
@@ -156 +170 @@
    * @returns the AL_FORMAT
    */
-  ALenum SoundBuffer::sdlAudioSpecToAlFormat(const SDL_AudioSpec* audiospec)
+  ALenum SoundBufferData::sdlAudioSpecToAlFormat(const SDL_AudioSpec* audiospec)
   {
     assert (audiospec != NULL);