Changeset 4883 in orxonox.OLD for orxonox/branches/weaponSystem/src/lib/sound/sound_engine.cc

Timestamp:

Jul 17, 2005, 4:02:36 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/weaponSystem: connecting sounds to the weapon works fine now

File:

• orxonox/branches/weaponSystem/src/lib/sound/sound_engine.cc (modified) (4 diffs)

orxonox/branches/weaponSystem/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      );
@@ -127 +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);
+//  printf("playing sound\n");
 }
 
@@ -229 +241 @@
 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));
 }