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

Timestamp:

Jun 15, 2006, 9:50:56 PM (18 years ago)

Author:

bensch

Message:

merged the branche atmos back. no conflicts

Location:

trunk/src/lib/sound

Files:

• sound_source.cc (modified) (4 diffs)
• sound_source.h (modified) (1 diff)

trunk/src/lib/sound/sound_source.cc

@@ -1 +1 @@
 /*
-        orxonox - the future of 3D-vertical-scrollers
-
-        Copyright (C) 2004 orx
-
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2, or (at your option)
-        any later version.
-
-        ### File Specific:
-        main-programmer: Benjamin Grauer
-        co-programmer: ...
+  orxonox - the future of 3D-vertical-scrollers
+ 
+  Copyright (C) 2004 orx
+ 
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2, or (at your option)
+  any later version.
+ 
+  ### File Specific:
+  main-programmer: Benjamin Grauer
+  co-programmer: ...
 */
 
@@ -85 +85 @@
     else
       this->stop();
-    return *this;
   }
 
@@ -190 +189 @@
       SoundEngine::checkError("Play Source", __LINE__);
   }
-
-
-  /**
-  * @brief Plays and loops back a SoundSource
-  */
-  void SoundSource::loop()
-  {
-    if (this->buffer && this->retrieveSource())
-    {
-      if (this->bPlay)
-        alSourceStop(this->sourceID);
-
+  
+   /**
+   * @brief Plays back buffer on this Source with gain and looping possibility
+   * @param buffer the buffer to play back on this Source
+    */
+  void SoundSource::play(const SoundBuffer* buffer, float gain, bool loop)
+  {
+    if (!this->retrieveSource())
+    {
+      PRINTF(3)("No more Free sources (You might consider raising the Source-Count).\n");
+      return;
+    }
+
+    alSourceStop(this->sourceID);
+    alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
+    
+    if (loop)
+        alSourcei (this->sourceID, AL_LOOPING,  AL_TRUE);
+    else
+        alSourcei (this->sourceID, AL_LOOPING,  AL_FALSE);
+    
+    alSourcef (this->sourceID, AL_GAIN, gain);
+
+    alSourcePlay(this->sourceID);
+
+    if (unlikely(this->buffer != NULL))
       alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
-      alSourcei (this->sourceID, AL_LOOPING,  AL_TRUE);
-      alSourcef (this->sourceID, AL_GAIN, 1);
-      alSourcePlay(this->sourceID);
-
-      if (DEBUG_LEVEL >= 3)
-        SoundEngine::checkError("Play Source", __LINE__);
-      this->bPlay = true;
-    }
-  }
-
-  /**
-  * @brief Plays and loops buffer on this Source
-  * @param buffer the buffer to play back on this Source
-  */
-  void SoundSource::loop(const SoundBuffer* buffer)
-  {
-    if (this->buffer && this->retrieveSource())
-    {
-      if (this->bPlay)
-        alSourceStop(this->sourceID);
-
-      alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
-      alSourcei (this->sourceID, AL_LOOPING,  AL_TRUE);
-      alSourcef (this->sourceID, AL_GAIN, 1);
-
-      alSourcePlay(this->sourceID);
-
-      if (DEBUG_LEVEL >= 3)
-        SoundEngine::checkError("Loop Source", __LINE__);
-      this->bPlay = true;
-    }
-  }
-
-
-  /**
-  * @brief Plays and loops buffer on this Source with gain control
-  * @param buffer the buffer to play back on this Source
-  */
-  void SoundSource::loop(const SoundBuffer* buffer, float gain)
-  {
-    if (this->buffer && this->retrieveSource())
-    {
-      if (this->bPlay)
-        alSourceStop(this->sourceID);
-
-      alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
-      alSourcei (this->sourceID, AL_LOOPING,  AL_TRUE);
-      alSourcef (this->sourceID, AL_GAIN, gain);
-
-      alSourcePlay(this->sourceID);
-
-      if (DEBUG_LEVEL >= 3)
-        SoundEngine::checkError("Loop Source", __LINE__);
-      this->bPlay = true;
-    }
-  }
+    this->bPlay = true;
+
+    if (DEBUG_LEVEL >= 3)
+      SoundEngine::checkError("Play Source", __LINE__);
+  } 
 
 
@@ -381 +343 @@
     }
 
-    //  alSourcePlay(this->sourceID);
-
-    //  if (DEBUG_LEVEL >= 3)
-    //          SoundEngine::checkError("Loop Source", __LINE__);
-    //  this->bPlay = true;
+    //  alSourcePlay(this->sourceID);
+
+    //  if (DEBUG_LEVEL >= 3)
+    //    SoundEngine::checkError("Loop Source", __LINE__);
+    //  this->bPlay = true;
     //}
 

trunk/src/lib/sound/sound_source.h

@@ -30 +30 @@
                         void play(const SoundBuffer* buffer);
                         void play(const SoundBuffer* buffer, float gain);
-                        void loop();
-                        void loop(const SoundBuffer* buffer);
-                        void loop(const SoundBuffer* buffer, float gain);
+      void play(const SoundBuffer* buffer, float gain, bool loop);   
+
                         void stop();
                         void pause();