Changeset 7297 in orxonox.OLD for trunk

Timestamp:

Apr 15, 2006, 9:48:08 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: now the sound gets correcty detached from the source, when a SoundSource releses its alSource

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (1 diff)
• lib/sound/sound_source.cc (modified) (8 diffs)
• story_entities/game_world.cc (modified) (4 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -140 +140 @@
     }
     empty();
-    SoundEngine::getInstance()->pushALSource(source);
+    alSourcei(this->source, AL_BUFFER, 0);
+    SoundEngine::getInstance()->pushALSource(this->source);
     this->source = 0;
     this->state &= !SourceAllocated;

trunk/src/lib/sound/sound_source.cc

@@ -25 +25 @@
 
 /**
- *  creates a SoundSource at position sourceNode with the SoundBuffer buffer
+ * @brief creates a SoundSource at position sourceNode with the SoundBuffer buffer
  */
 SoundSource::SoundSource(const PNode* sourceNode, const SoundBuffer* buffer)
@@ -42 +42 @@
 
 /**
- *  deletes a SoundSource
+ * @brief deletes a SoundSource
  */
 SoundSource::~SoundSource()
@@ -50 +50 @@
 
 /**
- *  Plays back a SoundSource
+ * @brief Plays back a SoundSource
  */
 void SoundSource::play()
@@ -92 +92 @@
 
 /**
- *  Stops playback of a SoundSource
+ * @brief Stops playback of a SoundSource
  */
 void SoundSource::stop()
@@ -102 +102 @@
     if (DEBUG >= 3)
       SoundEngine::checkError("StopSource", __LINE__);
+    alSourcei(this->sourceID, AL_BUFFER, 0);
     SoundEngine::getInstance()->pushALSource(this->sourceID);
     this->sourceID = 0;
@@ -108 +109 @@
 
 /**
- *  Pauses Playback of a SoundSource
+ * @brief Pauses Playback of a SoundSource
  */
 void SoundSource::pause()
@@ -118 +119 @@
 
 /**
- *  Rewinds Playback of a SoundSource
+ * @brief Rewinds Playback of a SoundSource
  */
 void SoundSource::rewind()
@@ -129 +130 @@
 
 /**
- *  sets the RolloffFactor of the Sound emitted from the SoundSource
+ * @brief sets the RolloffFactor of the Sound emitted from the SoundSource
  * @param rolloffFactor The Factor described
-
-   this tells openAL how fast the Sounds decay outward from the Source
+ *
+ * this tells openAL how fast the Sounds decay outward from the Source
  */
 void SoundSource::setRolloffFactor(ALfloat rolloffFactor)

trunk/src/story_entities/game_world.cc

@@ -136 +136 @@
 int GameWorld::createAudioThread(void* gameWorld)
 {
-/*  GameWorld* gw = (GameWorld*)gameWorld;
+  GameWorld* gw = (GameWorld*)gameWorld;
   printf("STARTIG AUDIO THREAD\n");
   if(gw->dataTank && gw->dataTank->music != NULL)
@@ -146 +146 @@
       gw->dataTank->music->update();
     SDL_Delay(1);
-  }*/
-  //printf("End the AudioThread\n");
+  }
+  printf("End the AudioThread\n");
 }
 
@@ -229 +229 @@
   if (this->audioThread == NULL)
     this->audioThread = SDL_CreateThread(GameWorld::createAudioThread, (void*)this);
-
-  if (this->dataTank->music != NULL)
-    this->dataTank->music->playback();
 
   this->run();
@@ -413 +410 @@
   PNode::getNullParent()->updateNode (this->dtS);
   SoundEngine::getInstance()->update();
-
-  if (this->dataTank->music != NULL)
-    this->dataTank->music->update();
-
 }