Changeset 9805 in orxonox.OLD for branches/new_class_id/src/lib

Timestamp:

Sep 24, 2006, 3:21:12 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: SoundSource completely added as a Resource

Location:

branches/new_class_id/src/lib

Files:

• lang/base_object.cc (modified) (1 diff)
• lang/object_list.cc (modified) (1 diff)
• shell/some_shell_commands.cc (modified) (1 diff)
• sound/sound_buffer.cc (modified) (2 diffs)
• sound/sound_buffer.h (modified) (4 diffs)
• sound/sound_buffer_data.cc (modified) (3 diffs)
• sound/sound_buffer_data.h (modified) (2 diffs)
• sound/sound_engine.cc (modified) (3 diffs)
• sound/sound_source.cc (modified) (14 diffs)
• sound/sound_source.h (modified) (6 diffs)
• util/loading/resource_manager.cc (modified) (1 diff)

branches/new_class_id/src/lib/lang/base_object.cc

@@ -45 +45 @@
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
   {
+    PRINTF(5)("DELETING OBJECT %s::%s FROM %s\n", this->getClassCName(), getCName(), (*it)._objectList->name().c_str());
     (*it)._objectList->unregisterObject((*it)._iterator);
     delete (*it)._iterator;

branches/new_class_id/src/lib/lang/object_list.cc

@@ -272 +272 @@
          ++it)
     {
-      printf("   + %s::%s\n", (*it)->getClassCName(), (*it)->getCName());
+      printf("   + %s::%s (%p)\n", (*it)->getClassCName(), (*it)->getCName(), (*it));
     }
   }

branches/new_class_id/src/lib/shell/some_shell_commands.cc

@@ -67 +67 @@
     ->setAlias("orxoquit");
 
+#include "object_list.h"
+SHELL_COMMAND_STATIC(debugAll, ObjectListBase, &ObjectListBase::debugAll);

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

@@ -20 +20 @@
 namespace OrxSound
 {
-  ObjectListDefinition(SoundBuffer);
   //////////////////
   /* SOUND-BUFFER */
   //////////////////
   SoundBuffer::SoundBuffer()
-  : data(new SoundBufferData)
+      : data(new SoundBufferData)
   {
-    this->registerObject(this, SoundBuffer::_objectList);
   }
   /**
@@ -34 +32 @@
    */
   SoundBuffer::SoundBuffer(const std::string& fileName)
-  : data(new SoundBufferData)
+      : data(new SoundBufferData)
   {
-    this->registerObject(this, SoundBuffer::_objectList);
-    this->setName(fileName);
-
     this->load(fileName);
   }
+
+  SoundBuffer::SoundBuffer(const SoundBuffer& buffer)
+      : data(buffer.data)
+  {  }
+
+  SoundBuffer::SoundBuffer(const SoundBufferData::Pointer& dataPointer)
+      : data(dataPointer)
+  {  };
 }

branches/new_class_id/src/lib/sound/sound_buffer.h

@@ -7 +7 @@
 #define _SOUND_BUFFER_H
 
-#include "base_object.h"
-#include "alincl.h"
-
 #include "sound_buffer_data.h"
 
@@ -15 +12 @@
 {
   //! A class that represents a datastructure to play Sounds.
-  class SoundBuffer : public BaseObject
+  class SoundBuffer
   {
-    ObjectListDeclaration(SoundBuffer);
   public:
     SoundBuffer();
-    SoundBuffer(const SoundBuffer& buffer) { this->data = buffer.data; }
-    SoundBuffer(const SoundBufferData::Pointer& dataPointer) { this->data = dataPointer; };
+    SoundBuffer(const SoundBuffer& buffer);
+    SoundBuffer(const SoundBufferData::Pointer& dataPointer);
     SoundBuffer(const std::string& fileName);
+
+    bool operator==(const SoundBuffer& buffer) const {return this->data == buffer.data; };
 
     /** @see SoundBufferData::load */
@@ -33 +31 @@
     /** @returns the ID of the buffer used in this SoundBuffer */
     inline ALuint getID() const { return this->data->getID(); }
+    inline bool loaded() const { return this->data->loaded(); }
 
     /** @returns the DataPointer */
@@ -38 +37 @@
     /** @param dataPointer the data to acquire @brief Buffer shall acquire dataPointers data */
     void acquireData(const SoundBufferData::Pointer& dataPointer)  { data = dataPointer; };
+
   private:
-    SoundBufferData::Pointer    data;
+    SoundBufferData::Pointer    data;                //!< Pointer to the Stored Data
   };
 }

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

@@ -50 +50 @@
     this->size = 0;
     this->loop = AL_FALSE;
-
-
+    this->bLoaded = false;
   }
 
@@ -112 +111 @@
     SDL_FreeWAV(wavBuffer);
     if (SoundEngine::checkError("Could not load Wave file", __LINE__))
+    {
+      this->bLoaded = true;
       return true;
+    }
     else
       return false;
@@ -160 +162 @@
       return false;
 
+    this->bLoaded = true;
     return true ;
-
   }
 

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

@@ -33 +33 @@
     /** @returns the ID of the buffer used in this SoundBuffer */
     inline ALuint getID() const { return this->bufferID; }
+    inline bool loaded() const { return bLoaded; };
 
   private:
@@ -42 +43 @@
     ALsizei       size;                 //!< The size of the Buffer.
     ALboolean     loop;                 //!< loop information.
+    bool          bLoaded;               //!< If the Sound was loaded this is true.
   };
 }

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

@@ -26 +26 @@
 #include "util/preferences.h"
 #include "globals.h"
+#include "resource_sound_buffer.h"
 
 namespace OrxSound
@@ -119 +120 @@
   SoundSource* SoundEngine::createSource(const std::string& fileName, PNode* sourceNode)
   {
-    SoundBuffer* buffer = NULL;
+    SoundBuffer buffer;
     if (!fileName.empty())
     {
-      buffer= (SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL);
-      if (buffer == NULL)
+      buffer = ResourceSoundBuffer(fileName);
+      if (!buffer.loaded())
         PRINTF(2)("Wav-Sound %s could not be loaded onto new Source\n", fileName.c_str());
     }
@@ -215 +216 @@
         if(play == AL_PLAYING)
         {
-          if (likely((*sourceIT)->getNode() != NULL))
+          if (likely((*sourceIT)->getNode() != NULL))
           {
             alSource3f((*sourceIT)->getID(), AL_POSITION,

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

@@ -19 +19 @@
 #include "sound_engine.h"
 
-#include "alincl.h"
 #include "compiler.h"
 #include "debug.h"
@@ -29 +28 @@
   * @brief creates a SoundSource at position sourceNode with the SoundBuffer buffer
   */
-  SoundSource::SoundSource(const PNode* sourceNode, const SoundBuffer* buffer)
+  SoundSource::SoundSource(const PNode* sourceNode, const SoundBuffer& buffer)
   {
     this->registerObject(this, SoundSource::_objectList);
@@ -120 +119 @@
   void SoundSource::play()
   {
-    if (this->buffer && this->retrieveSource())
+    if (this->retrieveSource())
     {
       if (this->bPlay)
         alSourceStop(this->sourceID);
 
-      alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+      alSourcei (this->sourceID, AL_BUFFER, this->buffer.getID());
       alSourcei (this->sourceID, AL_LOOPING,  AL_FALSE);
       alSourcef (this->sourceID, AL_GAIN, 1);
@@ -141 +140 @@
   * @param buffer the buffer to play back on this Source
   */
-  void SoundSource::play(const SoundBuffer* buffer)
+  void SoundSource::play(const SoundBuffer& buffer)
   {
     if (!this->retrieveSource())
@@ -150 +149 @@
 
     alSourceStop(this->sourceID);
-    alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
+    alSourcei (this->sourceID, AL_BUFFER, buffer.getID());
     alSourcei (this->sourceID, AL_LOOPING,  AL_FALSE);
     alSourcef (this->sourceID, AL_GAIN, 1);
@@ -156 +155 @@
     alSourcePlay(this->sourceID);
 
-    if (unlikely(this->buffer != NULL))
-      alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+    if (unlikely(this->buffer.getID() != 0))
+      alSourcei (this->sourceID, AL_BUFFER, this->buffer.getID());
     this->bPlay = true;
 
@@ -170 +169 @@
    * @param gain the gain of the sound buffer
   */
-  void SoundSource::play(const SoundBuffer* buffer, float gain)
+  void SoundSource::play(const SoundBuffer& buffer, float gain)
   {
     if (!this->retrieveSource())
@@ -179 +178 @@
 
     alSourceStop(this->sourceID);
-    alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
+    alSourcei (this->sourceID, AL_BUFFER, buffer.getID());
     alSourcei (this->sourceID, AL_LOOPING,  AL_FALSE);
     alSourcef (this->sourceID, AL_GAIN, gain);
@@ -185 +184 @@
     alSourcePlay(this->sourceID);
 
-    if (unlikely(this->buffer != NULL))
-      alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+    if (unlikely(this->buffer.getID() != 0))
+      alSourcei (this->sourceID, AL_BUFFER, this->buffer.getID());
     this->bPlay = true;
 
@@ -199 +198 @@
    * @param loop if true, sound gets looped
    */
-  void SoundSource::play(const SoundBuffer* buffer, float gain, bool loop)
+  void SoundSource::play(const SoundBuffer& buffer, float gain, bool loop)
   {
     if (!this->retrieveSource())
@@ -208 +207 @@
 
     alSourceStop(this->sourceID);
-    alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
+    alSourcei (this->sourceID, AL_BUFFER, buffer.getID());
 
     if (loop)
@@ -219 +218 @@
     alSourcePlay(this->sourceID);
 
-    if (unlikely(this->buffer != NULL))
-      alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
+    if (unlikely(this->buffer.getID() != 0))
+      alSourcei (this->sourceID, AL_BUFFER, this->buffer.getID());
     this->bPlay = true;
 
@@ -232 +231 @@
    * @param gain the new gain value
    */
-  void SoundSource::gain(const SoundBuffer* buffer, float gain)
+  void SoundSource::gain(const SoundBuffer& buffer, float gain)
   {
     // alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
@@ -347 +346 @@
   * @param duration time perios to fade in
   */
-  void SoundSource::fadein(const SoundBuffer* buffer, ALfloat duration)
+  void SoundSource::fadein(const SoundBuffer& buffer, ALfloat duration)
   {
     //if (this->buffer && this->retrieveSource())

branches/new_class_id/src/lib/sound/sound_source.h

@@ -8 +8 @@
 
 #include "base_object.h"
+#include "sound_buffer.h"
 #include "alincl.h"
 
@@ -14 +15 @@
 namespace OrxSound
 {
-  class SoundBuffer;
   //! A class that represents a SoundSource
   class SoundSource : public BaseObject
@@ -20 +20 @@
     ObjectListDeclaration(SoundSource);
   public:
-    SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);
+    SoundSource(const PNode* sourceNode = NULL, const SoundBuffer& buffer = SoundBuffer());
     SoundSource(const SoundSource& source);
     SoundSource& operator=(const SoundSource& source);
@@ -29 +29 @@
     // user interaction
     void play();
-    void play(const SoundBuffer* buffer);
-    void play(const SoundBuffer* buffer, float gain);
-    void play(const SoundBuffer* buffer, float gain, bool loop);
+    void play(const SoundBuffer& buffer);
+    void play(const SoundBuffer& buffer, float gain);
+    void play(const SoundBuffer& buffer, float gain, bool loop);
 
-    void gain(const SoundBuffer* buffer, float gain);
+    void gain(const SoundBuffer& buffer, float gain);
 
     void stop();
     void pause();
     void rewind();
-    void fadein(const SoundBuffer* buffer, ALfloat duration);
+    void fadein(const SoundBuffer& buffer, ALfloat duration);
 
     // development functions
@@ -47 +47 @@
     void setSourceNode(const PNode* sourceNode);
     /** @returns the SoundBuffer of this Source */
-    inline const SoundBuffer* getBuffer() const { return this->buffer; };
+    inline const SoundBuffer& getBuffer() const { return this->buffer; };
     /** @returns the SourceNode of this Source */
     inline const PNode* getNode() const { return this->sourceNode; };
@@ -66 +66 @@
     bool                   resident;    //!< If the alSource should be resident (if true, the alSource will be returned on deletion).
     ALuint                 sourceID;    //!< The ID of the Source
-    const SoundBuffer*     buffer;      //!< The buffer to play in this source.
+    SoundBuffer            buffer;      //!< The buffer to play in this source.
     const PNode*           sourceNode;  //!< The SourceNode representing the position/velocity... of this source.
   };

branches/new_class_id/src/lib/util/loading/resource_manager.cc

@@ -442 +442 @@
     case WAV:
       if(File(fullName).isFile())
-        tmpResource->pointer = new OrxSound::SoundBuffer(fullName);
+//        tmpResource->pointer = new OrxSound::SoundBuffer(fullName);
       break;
     case OGG: