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

Timestamp:

Jul 18, 2005, 3:36:18 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

Location:

orxonox/trunk/src/lib/sound

Files:

• sound_engine.cc (modified) (5 diffs)
• sound_engine.h (modified) (3 diffs)

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

@@ -91 +91 @@
  *  creates a SoundSource at position sourceNode with the SoundBuffer buffer
 */
-SoundSource::SoundSource(SoundBuffer* buffer, PNode* sourceNode)
+SoundSource::SoundSource(const PNode* sourceNode, const SoundBuffer* buffer)
 {
   this->setClassID(CL_SOUND_SOURCE, "SoundSource");
@@ -106 +106 @@
   if ((result = alGetError()) != AL_NO_ERROR)
     SoundEngine::PrintALErrorString(result);
-  alSourcei (this->sourceID, AL_BUFFER,   this->buffer->getID());
+  if (this->buffer != NULL)
+    alSourcei (this->sourceID, AL_BUFFER,   this->buffer->getID());
   alSourcef (this->sourceID, AL_PITCH,    1.0      );
   alSourcef (this->sourceID, AL_GAIN,     1.0      );
@@ -121 +122 @@
 }
 
-
 /**
  *  Plays back a SoundSource
@@ -128 +128 @@
 {
   alSourcePlay(this->sourceID);
+}
+
+/**
+ * Plays back buffer on this Source
+ * @param buffer the buffer to play back on this Source
+ */
+void SoundSource::play(const SoundBuffer* buffer)
+{
+  alSourcei (this->sourceID, AL_BUFFER, buffer->getID());
+  alSourcePlay(this->sourceID);
+
+  if (unlikely(this->buffer != NULL))
+    alSourcei (this->sourceID, AL_BUFFER, this->buffer->getID());
 }
 
@@ -230 +243 @@
 SoundSource* SoundEngine::createSource(const char* fileName, PNode* sourceNode)
 {
-  return new SoundSource((SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL), sourceNode);
+  return new SoundSource(sourceNode, (SoundBuffer*)ResourceManager::getInstance()->load(fileName, WAV, RP_LEVEL));
 }
 

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

@@ -27 +27 @@
 
   /** @returns the ID of the buffer used in this SoundBuffer */
-  inline ALuint getID() { return this->bufferID; }
+  inline ALuint getID() const { return this->bufferID; }
 
  private:
@@ -40 +40 @@
 {
  public:
-  SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL);
+  SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);
   ~SoundSource();
 
   // user interaction
   void play();
+  void play(const SoundBuffer* buffer);
   void stop();
   void pause();
@@ -53 +54 @@
   inline ALuint getID() const { return this->sourceID; }
   /** @returns the SoundBuffer of this Source */
-  inline SoundBuffer* getBuffer() const { return this->buffer; }
+  inline const SoundBuffer* getBuffer() const { return this->buffer; }
   /** @returns the SourceNode of this Source */
-  inline PNode* getNode() const { return this->sourceNode;}
+  inline const PNode* getNode() const { return this->sourceNode;}
 
   void setRolloffFactor(ALfloat rolloffFactor);
 
  private:
-  ALuint           sourceID;              //!< The ID of the Source
-  SoundBuffer*     buffer;                //!< The buffer to play in this source.
-  PNode*           sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
+  ALuint                 sourceID;              //!< The ID of the Source
+  const SoundBuffer*     buffer;                //!< The buffer to play in this source.
+  const PNode*           sourceNode;            //!< The SourceNode represente the position/velocity... of this source.
 };