Changeset 7299 in orxonox.OLD

Timestamp:

Apr 16, 2006, 5:48:40 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: some nice Class-Stuff

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (2 diffs)
• lib/sound/ogg_player.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (11 diffs)
• lib/sound/sound_engine.h (modified) (1 diff)
• lib/sound/sound_source.cc (modified) (3 diffs)
• lib/sound/sound_source.h (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -102 +102 @@
     return false;
   }
+  this->state |= FileOpened;
 
   // acquiring the vorbis-properties.
   vorbisInfo = ov_info(&oggStream, -1);
   vorbisComment = ov_comment(&oggStream, -1);
-  this->state |= FileOpened;
+
   if(vorbisInfo->channels == 1)
     format = AL_FORMAT_MONO16;
@@ -129 +130 @@
 void OggPlayer::release()
 {
-  this->printState();
   if (this->state & SourceAllocated)
   {

trunk/src/lib/sound/ogg_player.h

@@ -19 +19 @@
 
 
-#define BUFFER_SIZE (8096 * 16)
+#define BUFFER_SIZE (8096 * 2)
 
 

trunk/src/lib/sound/sound_engine.cc

@@ -36 +36 @@
 //////////////////
 /**
- *  standard constructor
+ * @brief standard constructor
 */
 SoundEngine::SoundEngine ()
@@ -59 +59 @@
 
 /**
- *  the singleton reference to this class
+ * @brief the singleton reference to this class
 */
 SoundEngine* SoundEngine::singletonRef = NULL;
 
 /**
- *  standard deconstructor
+ * @brief standard destructor
  */
 SoundEngine::~SoundEngine ()
@@ -105 +105 @@
 
 /**
- * loads the settings of the SoundEngine from an ini-file
+ * @brief loads the settings of the SoundEngine from an ini-file
  */
 void SoundEngine::loadSettings()
@@ -120 +120 @@
 
 /**
- *  creates a new SoundSource.
+ * @brief creates a new SoundSource.
  * @param fileName The Name to load the SoundBuffer from
  * @param sourceNode The sourceNode to bind this SoundSource to.
@@ -133 +133 @@
 
 /**
- *  Sets the doppler values of openAL
+ * @brief Sets the doppler values of openAL
  * @param dopplerFactor the extent of the doppler-effect
  * @param dopplerVelocity the Speed the sound travels
@@ -147 +147 @@
 
 
+/**
+ * @brief retrieves an OpenAL Source from the availiable Sources.
+ * @param source the Source to fill with the Value.
+ */
 void SoundEngine::popALSource(ALuint& source)
 {
@@ -158 +162 @@
     this->ALSources.pop();
     SDL_mutexV(this->sourceMutex);
-    printf("Retrieve Source %d\n", source);
-  }
-}
-
+  }
+}
+
+
+/**
+ * @brief Pushes an OpenAL Source back into the Stack of known sources
+ * @param source the Source to push onto the top of the SourceStack
+ */
 void SoundEngine::pushALSource(ALuint& source)
 {
@@ -174 +182 @@
 
 /**
- *  updates all The positions, Directions and Velocities of all Sounds
-*/
+ * @brief updates all The positions, Directions and Velocities of all Sounds
+ */
 void SoundEngine::update()
 {
@@ -239 +247 @@
 }
 
-/**
- *  Removes all the Buffers that are not anymore needed by any Sources
-*/
-void SoundEngine::flushUnusedBuffers()
-{
-  /// FIXME
-  /*  if(this->sourceList && this->bufferList)
-    {
-      tIterator<BaseObject>* bufferIterator = this->bufferList->getIterator();
-      SoundBuffer* enumBuffer = (SoundBuffer*)bufferIterator->firstElement();
-      while (enumBuffer)
-      {
-        tIterator<BaseObject>* sourceIterator = this->sourceList->getIterator();
-        SoundSource* enumSource = (SoundSource*)sourceIterator->firstElement();
-        while (enumSource)
-        {
-          if (enumBuffer == enumSource->getBuffer())
-            break;
-          enumSource = (SoundSource*)sourceIterator->nextElement();
-        }
-        delete sourceIterator;
-        if (enumSource == NULL)
-          ResourceManager::getInstance()->unload(enumBuffer);
-        enumBuffer = (SoundBuffer*)bufferIterator->nextElement();
-      }
-      delete bufferIterator;
-  }*/ /// FIXME
-}
-
-/**
- * flushes all the Buffers
- * deletes them from the BufferList, and also removes them via the ResourceManager.
- */
-void SoundEngine::flushAllBuffers()
-{
-  if (this->bufferList)
-  {
-    while (this->bufferList->size() > 0)
-      ResourceManager::getInstance()->unload(static_cast<SoundBuffer*>(this->bufferList->front()), RP_LEVEL);
-  }
-}
-
-/**
- * deletes all the Sources.
- */
-void SoundEngine::flushAllSources()
-{
-  if (this->sourceList)
-  {
-    while(this->sourceList->size() > 0)
-      delete this->sourceList->front();
-  }
-}
 
 /**
@@ -378 +333 @@
 }
 
+/**
+ * @brief checks for an OpenAL error
+ * @param error the ErrorMessage to display
+ * @param line on what line did the error occure.
+ */
 bool SoundEngine::checkError(const std::string& error, unsigned int line)
 {
@@ -390 +350 @@
 }
 
+/**
+ * @brief check for an ALC error.
+ * @brief error the Error-String to display
+ * @param line on that line, the error occured (debugging mode).
+ */
 bool SoundEngine::checkALCError(const std::string& error, unsigned int line)
 {

trunk/src/lib/sound/sound_engine.h

@@ -52 +52 @@
     void pushALSource(ALuint& source);
 
-    void flushUnusedBuffers();
-    void flushAllBuffers();
-    void flushAllSources();
 
     bool initAudio();

trunk/src/lib/sound/sound_source.cc

@@ -31 +31 @@
   this->setClassID(CL_SOUND_SOURCE, "SoundSource");
 
-  ALenum result;
-
   // adding the Source to the SourcesList of the SoundEngine
   this->buffer = buffer;
@@ -39 +37 @@
   this->sourceID = 0;
   this->bPlay = false;
+}
+
+/**
+ * @brief construct a SoundSource out of the another soundSource
+ * @param source the Source to create this source from.
+ *
+ * Copies the buffer from source to this Source.
+ * Acquires a new SourceID if source is Playing.
+ */
+SoundSource::SoundSource(const SoundSource& source)
+{
+  this->setClassID(CL_SOUND_SOURCE, "SoundSource");
+
+  // adding the Source to the SourcesList of the SoundEngine
+  this->buffer = source.buffer;
+  this->sourceNode = source.sourceNode;
+
+  this->sourceID = 0;
+  if (source.bPlay == true)
+  {
+    this->bPlay = true;
+    SoundEngine::getInstance()->popALSource(this->sourceID);
+  }
+  else
+    this->bPlay = false;
+}
+
+/**
+ * @brief paste a copy of the source into this Source.
+ * @param source the SoundSource to paste into this one.
+ * @returns a Reference to this Source.
+ *
+ */
+SoundSource& SoundSource::operator=(const SoundSource& source)
+{
+  this->buffer = source.buffer;
+  this->sourceNode = sourceNode;
+
+  if (source.bPlay)
+    this->play();
+  else
+    this->stop();
+}
+
+/**
+ * @brief compares two Sources with each other.
+ * @param source the Source to compare against this One.
+ * Two Sources are the same, if the PNodes match, and the Sound Played are the same.
+ * The alSource must not match, because no two Sources can have the same alSource.
+ */
+bool SoundSource::operator==(const SoundSource& source)
+{
+  return (this->buffer == source.buffer &&
+          this->bPlay == source.bPlay &&
+          this->sourceNode == source.sourceNode);
 }
 
@@ -77 +130 @@
     }
   }
-//  assert (this->sourceID != 0);
+  //  assert (this->sourceID != 0);
 
   alSourceStop(this->sourceID);

trunk/src/lib/sound/sound_source.h

@@ -19 +19 @@
   public:
     SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);
+    SoundSource(const SoundSource& source);
+    SoundSource& operator=(const SoundSource& source);
+    bool operator==(const SoundSource& source);
+
     virtual ~SoundSource();
 

trunk/src/story_entities/game_world_data.cc

@@ -345 +345 @@
     this->setSoundTrack("");
   this->music = NULL;
-  /* stop the sound eninge */
-  SoundEngine::getInstance()->flushAllBuffers();
-  SoundEngine::getInstance()->flushAllSources();
 
   /* unload the shaders */