Changeset 9686 in orxonox.OLD for branches/new_class_id/src/lib/sound

Timestamp:

Aug 22, 2006, 2:36:54 PM (18 years ago)

Author:

bensch

Message:

new_class_id: many more classes done

Location:

branches/new_class_id/src/lib/sound

Files:

• ogg_player.cc (modified) (2 diffs)
• ogg_player.h (modified) (1 diff)
• sound_buffer.cc (modified) (2 diffs)
• sound_buffer.h (modified) (1 diff)
• sound_engine.cc (modified) (8 diffs)
• sound_engine.h (modified) (2 diffs)
• sound_source.cc (modified) (3 diffs)
• sound_source.h (modified) (1 diff)

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

@@ -49 +49 @@
 namespace OrxSound
 {
+  NewObjectListDefinition(OggPlayer);
   /**
    * initializes an Ogg-player from a file
@@ -55 +56 @@
   OggPlayer::OggPlayer(const std::string& fileName)
   {
-    this->setClassID(CL_SOUND_OGG_PLAYER, "OggPlayer");
+    this->registerObject(this, OggPlayer::_objectList);
 
     this->state = OggPlayer::None;

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

@@ -25 +25 @@
   class OggPlayer : public BaseObject
   {
+    NewObjectListDeclaration(OggPlayer);
+
   public:
     /**

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

@@ -35 +35 @@
 namespace OrxSound
 {
+  NewObjectListDefinition(SoundBuffer);
   //////////////////
   /* SOUND-BUFFER */
@@ -44 +45 @@
   SoundBuffer::SoundBuffer(const std::string& fileName)
   {
-    this->setClassID(CL_SOUND_BUFFER, "SoundBuffer");
+    this->registerObject(this, SoundBuffer::_objectList);
     this->setName(fileName);
 

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

@@ -18 +18 @@
   class SoundBuffer : public BaseObject
   {
+    NewObjectListDeclaration(SoundBuffer);
   public:
     SoundBuffer(const std::string& fileName);

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

@@ -20 +20 @@
 
 #include "sound_engine.h"
-
-#include "class_list.h"
 
 #include "p_node.h"
@@ -31 +29 @@
 namespace OrxSound
 {
-
+  NewObjectListDefinition(SoundEngine);
   //////////////////
   /* SOUND-ENGINE */
@@ -40 +38 @@
   SoundEngine::SoundEngine ()
   {
-    this->setClassID(CL_SOUND_ENGINE, "SoundEngine");
+    this->registerObject(this, SoundEngine::_objectList);
     this->setName("SoundEngine");
 
     this->listener = NULL;
-    this->bufferList = NULL;
-    this->sourceList = NULL;
 
     this->device = NULL;
@@ -69 +65 @@
   {
     // deleting all the SoundSources
-    if(this->sourceList != NULL)
-    {
-      while (this->sourceList->size() > 0)
-        delete static_cast<SoundSource*>(this->sourceList->front());
-    }
+    while (!SoundSource::objectList().empty())
+      delete (SoundSource::objectList().front());
 
     while(!this->ALSources.empty())
@@ -89 +82 @@
 
     // deleting all the SoundBuffers
-    if (this->bufferList != NULL)
-    {
-      while(this->bufferList->size() > 0)
-        ResourceManager::getInstance()->unload(static_cast<SoundBuffer*>(this->bufferList->front()));
-    }
+    while(!SoundBuffer::objectList().empty())
+      ResourceManager::getInstance()->unload(SoundBuffer::objectList().front());
 
     // removing openAL from AudioResource
@@ -212 +202 @@
 
     // updating all the Sources positions
-    if (likely(this->sourceList != NULL || (this->sourceList = ClassList::getList(CL_SOUND_SOURCE)) != NULL))
-    {
-      std::list<BaseObject*>::const_iterator sourceIT;
-      SoundSource* source;
-      for (sourceIT = this->sourceList->begin(); sourceIT != this->sourceList->end(); sourceIT++)
+    NewObjectList<SoundSource>::const_iterator sourceIT;
+    for (sourceIT = SoundSource::objectList().begin();
+         sourceIT != SoundSource::objectList().end();
+         sourceIT++)
+    {
+      if ((*sourceIT)->isPlaying())
       {
-        source = static_cast<SoundSource*>(*sourceIT);
-        if (source->isPlaying())
+        int play = 0x000;
+        alGetSourcei((*sourceIT)->getID(), AL_SOURCE_STATE, &play);
+        if (DEBUG_LEVEL > 2)
+          SoundEngine::checkError("SoundEngine::update() Play", __LINE__);
+        if(play == AL_PLAYING)
         {
-          int play = 0x000;
-          alGetSourcei(source->getID(), AL_SOURCE_STATE, &play);
-          if (DEBUG_LEVEL > 2)
-            SoundEngine::checkError("SoundEngine::update() Play", __LINE__);
-          if(play == AL_PLAYING)
+          if (likely((*sourceIT)->getNode() != NULL))
           {
-            if (likely(source->getNode() != NULL))
-            {
-              alSource3f(source->getID(), AL_POSITION,
-                         source->getNode()->getAbsCoor().x,
-                         source->getNode()->getAbsCoor().y,
-                         source->getNode()->getAbsCoor().z);
-              if (DEBUG_LEVEL > 2)
-                SoundEngine::checkError("SoundEngine::update() Set Source Position", __LINE__);
-              alSource3f(source->getID(), AL_VELOCITY,
-                         source->getNode()->getVelocity().x,
-                         source->getNode()->getVelocity().y,
-                         source->getNode()->getVelocity().z);
-              if (DEBUG_LEVEL > 2)
-                SoundEngine::checkError("SoundEngine::update() Set Source Velocity", __LINE__);
-            }
+            alSource3f((*sourceIT)->getID(), AL_POSITION,
+                       (*sourceIT)->getNode()->getAbsCoor().x,
+                       (*sourceIT)->getNode()->getAbsCoor().y,
+                       (*sourceIT)->getNode()->getAbsCoor().z);
+            if (DEBUG_LEVEL > 2)
+              SoundEngine::checkError("SoundEngine::update() Set Source Position", __LINE__);
+            alSource3f((*sourceIT)->getID(), AL_VELOCITY,
+                       (*sourceIT)->getNode()->getVelocity().x,
+                       (*sourceIT)->getNode()->getVelocity().y,
+                       (*sourceIT)->getNode()->getVelocity().z);
+            if (DEBUG_LEVEL > 2)
+              SoundEngine::checkError("SoundEngine::update() Set Source Velocity", __LINE__);
           }
-          else
-          {
-            source->stop();
-          }
+        }
+        else
+        {
+          (*sourceIT)->stop();
         }
       }
@@ -393 +380 @@
       default:
       case AL_NO_ERROR:
-        return ("AL_NO_ERROR");
+      return ("AL_NO_ERROR");
       case AL_INVALID_NAME:
-        return ("AL_INVALID_NAME");
+      return ("AL_INVALID_NAME");
       case AL_INVALID_ENUM:
-        return ("AL_INVALID_ENUM");
+      return ("AL_INVALID_ENUM");
       case AL_INVALID_VALUE:
-        return ("AL_INVALID_VALUE");
+      return ("AL_INVALID_VALUE");
       case AL_INVALID_OPERATION:
-        return ("AL_INVALID_OPERATION");
+      return ("AL_INVALID_OPERATION");
       case AL_OUT_OF_MEMORY:
-        return ("AL_OUT_OF_MEMORY");
+      return ("AL_OUT_OF_MEMORY");
     };
   }
@@ -414 +401 @@
       default:
       case ALC_NO_ERROR:
-        return ("AL_NO_ERROR");
+      return ("AL_NO_ERROR");
       case ALC_INVALID_DEVICE:
-        return ("ALC_INVALID_DEVICE");
+      return ("ALC_INVALID_DEVICE");
       case ALC_INVALID_CONTEXT:
-        return("ALC_INVALID_CONTEXT");
+      return("ALC_INVALID_CONTEXT");
       case ALC_INVALID_ENUM:
-        return("ALC_INVALID_ENUM");
+      return("ALC_INVALID_ENUM");
       case ALC_INVALID_VALUE:
-        return ("ALC_INVALID_VALUE");
+      return ("ALC_INVALID_VALUE");
       case ALC_OUT_OF_MEMORY:
-        return("ALC_OUT_OF_MEMORY");
+      return("ALC_OUT_OF_MEMORY");
     };
   }

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

@@ -27 +27 @@
   class SoundEngine : public BaseObject
   {
-  public:
+    NewObjectListDeclaration(SoundEngine);
+    public:
     virtual ~SoundEngine();
     /** @returns a Pointer to the only object of this Class */
@@ -75 +76 @@
     const PNode*                   listener;                 //!< The listener of the Scene
 
-    const std::list<BaseObject*>*  bufferList;               //!< A list of buffers
-    const std::list<BaseObject*>*  sourceList;               //!< A list for all the sources in the scene.
-
     unsigned int                   maxSourceCount;           //!< How many Sources is the Maximum
     std::stack<ALuint>             ALSources;                //!< A list of real openAL-Sources, the engine allocates, and stores for reuse.

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

@@ -25 +25 @@
 namespace OrxSound
 {
+  NewObjectListDefinition(SoundSource);
   /**
   * @brief creates a SoundSource at position sourceNode with the SoundBuffer buffer
@@ -30 +31 @@
   SoundSource::SoundSource(const PNode* sourceNode, const SoundBuffer* buffer)
   {
-    this->setClassID(CL_SOUND_SOURCE, "SoundSource");
-
+    this->registerObject(this, SoundSource::_objectList);
     // adding the Source to the SourcesList of the SoundEngine
     this->buffer = buffer;
@@ -51 +51 @@
   SoundSource::SoundSource(const SoundSource& source)
   {
-    this->setClassID(CL_SOUND_SOURCE, "SoundSource");
+    this->registerObject(this, SoundSource::_objectList);
 
     // adding the Source to the SourcesList of the SoundEngine

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

@@ -18 +18 @@
   class SoundSource : public BaseObject
   {
+    NewObjectListDeclaration(SoundSource);
   public:
     SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);