Changeset 4597 in orxonox.OLD for orxonox/trunk/src/lib/sound

Timestamp:

Jun 11, 2005, 12:55:48 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: setClassID implemented in all files

Location:

orxonox/trunk/src/lib/sound

Files:

• sound_engine.cc (modified) (12 diffs)
• sound_engine.h (modified) (4 diffs)

orxonox/trunk/src/lib/sound/sound_engine.cc

@@ -1 @@
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -40 +40 @@
 SoundBuffer::SoundBuffer(const char* fileName)
 {
+  this->setClassID(CL_SOUND_BUFFER, "SoundBuffer");
+  this->setName(fileName);
+
   SoundEngine::getInstance()->addBuffer(this);
 
@@ -45 +48 @@
   ALvoid* data;
   ALsizei freq;
-  
+
   ALenum result;
 
@@ -57 +60 @@
   if ((result = alGetError()) != AL_NO_ERROR)
     SoundEngine::PrintALErrorString(result);
-  
+
   // send the loaded wav data to the buffer
   alBufferData(this->bufferID, format, data, this->size, freq);
@@ -83 +86 @@
 SoundSource::SoundSource(SoundBuffer* buffer, PNode* sourceNode)
 {
+  this->setClassID(CL_SOUND_SOURCE, "SoundSource");
+
   ALenum result;
 
@@ -161 +166 @@
    \brief standard constructor
 */
-SoundEngine::SoundEngine () 
-{
-  this->setClassName ("SoundEngine");
-  
+SoundEngine::SoundEngine ()
+{
+  this->setClassID(CL_SOUND_ENGINE, "SoundEngine");
+  this->setName("SoundEngine");
+
   this->listener = NULL;
   this->bufferList = new tList<SoundBuffer>;
@@ -179 +185 @@
 
 */
-SoundEngine::~SoundEngine () 
+SoundEngine::~SoundEngine ()
 {
   SoundEngine::singletonRef = NULL;
@@ -262 +268 @@
     {
       if (buffer == enumSource->getBuffer())
-        delete enumSource;
+        delete enumSource;
       enumSource = sourceIterator->nextElement();
     }
@@ -300 +306 @@
     {
       alListener3f(AL_POSITION,
-                   this->listener->getAbsCoor().x,
-                   this->listener->getAbsCoor().y,
-                   this->listener->getAbsCoor().z);
+                   this->listener->getAbsCoor().x,
+                   this->listener->getAbsCoor().y,
+                   this->listener->getAbsCoor().z);
       alListener3f(AL_VELOCITY,
-                   this->listener->getVelocity().x,
-                   this->listener->getVelocity().y,
-                   this->listener->getVelocity().z);
+                   this->listener->getVelocity().x,
+                   this->listener->getVelocity().y,
+                   this->listener->getVelocity().z);
       Vector absDirV = this->listener->getAbsDirV();
       ALfloat orientation [6] = {1,0,0, absDirV.x, absDirV.y, absDirV.z};
@@ -321 +327 @@
       if (likely(enumSource->getNode()!=NULL))
       {
-        alSource3f(enumSource->getID(), AL_POSITION,
-                   enumSource->getNode()->getAbsCoor().x,
-                   enumSource->getNode()->getAbsCoor().y,
-                   enumSource->getNode()->getAbsCoor().z);
-        alSource3f(enumSource->getID(), AL_VELOCITY,
-                   enumSource->getNode()->getVelocity().x,
-                   enumSource->getNode()->getVelocity().y,
-                   enumSource->getNode()->getVelocity().z);
+        alSource3f(enumSource->getID(), AL_POSITION,
+                   enumSource->getNode()->getAbsCoor().x,
+                   enumSource->getNode()->getAbsCoor().y,
+                   enumSource->getNode()->getAbsCoor().z);
+        alSource3f(enumSource->getID(), AL_VELOCITY,
+                   enumSource->getNode()->getVelocity().x,
+                   enumSource->getNode()->getVelocity().y,
+                   enumSource->getNode()->getVelocity().z);
       }
       enumSource = iterator->nextElement();
@@ -347 +353 @@
       SoundSource* enumSource = sourceIterator->nextElement();
       while (enumSource)
-        {
-          if (enumBuffer == enumSource->getBuffer())
-            break;
-          enumSource = sourceIterator->nextElement();
-        }
+        {
+          if (enumBuffer == enumSource->getBuffer())
+            break;
+          enumSource = sourceIterator->nextElement();
+        }
       delete sourceIterator;
       if (enumSource == NULL)
-        ResourceManager::getInstance()->unload(enumBuffer);
+        ResourceManager::getInstance()->unload(enumBuffer);
       enumBuffer = bufferIterator->nextElement();
     }
@@ -402 +408 @@
       PRINTF(4)("AL_NO_ERROR\n");
       break;
-      
+
     case AL_INVALID_NAME:
       PRINTF(2)("AL_INVALID_NAME\n");

orxonox/trunk/src/lib/sound/sound_engine.h

@@ -1 @@
-/*! 
+/*!
     \file sound_engine.h
-    \brief Definition of the SoundEngine singleton Class  
+    \brief Definition of the SoundEngine singleton Class
 */
 
@@ -20 +20 @@
 
 //! A class that represents a datastructure to play Sounds.
-class SoundBuffer
+class SoundBuffer : public BaseObject
 {
  public:
@@ -37 +37 @@
 
 //! A class that represents a SoundSource
-class SoundSource
+class SoundSource : virtual public BaseObject
 {
  public:
   SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL);
   ~SoundSource(void);
-  
+
   // user interaction
   void play();
@@ -48 +48 @@
   void pause();
   void rewind();
-  
+
   // development functions
   /** \returns The ID of this Source */
   inline ALuint getID(void) const { return this->sourceID; }
   /** \returns the SoundBuffer of this Source */
-  inline SoundBuffer* getBuffer(void) const { return this->buffer; } 
+  inline SoundBuffer* getBuffer(void) const { return this->buffer; }
   /** \returns the SourceNode of this Source */
   inline PNode* getNode(void) const { return this->sourceNode;}