Changeset 7292 in orxonox.OLD for trunk

Timestamp:

Apr 14, 2006, 11:18:42 AM (19 years ago)

Author:

bensch

Message:

better debug, (non-threaded again)

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (8 diffs)
• lib/sound/ogg_player.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (5 diffs)

trunk/src/lib/sound/ogg_player.cc

@@ -99 +99 @@
   alSourcei (source, AL_SOURCE_RELATIVE, AL_TRUE      );
   alSourcef (source, AL_GAIN,            SoundEngine::getInstance()->getMusicVolume());
+  SoundEngine::checkError("OggPlayer::SetSourceProperties", __LINE__);
 
   this->trackLoaded = true;
@@ -112 +113 @@
     return;
   alSourceStop(source);
+  SoundEngine::checkError("OggPlayer::release()::alSourceStop", __LINE__);
   empty();
   SoundEngine::getInstance()->pushALSource(source);
   this->source = 0;
-  check();
   alDeleteBuffers(2, buffers);
+  SoundEngine::checkError("OggPlayer::release()::alDeleteBuffers", __LINE__);
   this->buffers[0] = 0;
   this->buffers[1] = 0;
-  check();
 
   ov_clear(&oggStream);
@@ -138 +139 @@
     return true;
 
-  if(!stream(buffers[0]))
-    return false;
-
-  if(!stream(buffers[1]))
-    return false;
-
-  alSourceQueueBuffers(source, 2, buffers);
-  alSourcePlay(source);
-
+  if(!stream(buffers[0]) || !stream(buffers[1]))
+    return false;
+
+  alSourceQueueBuffers(this->source, 2, this->buffers);
+  if (DEBUG >= 3)
+    SoundEngine::checkError("OggPlayer::playback()::alSourceQueueBuffers", __LINE__);
+  alSourcePlay(this->source);
+  if (DEBUG >= 3)
+    SoundEngine::checkError("OggPlayer::playback()::alSourcePlay", __LINE__);
+  printf("%d\n", this->source);
   return true;
 }
@@ -178 +180 @@
 
   alGetSourcei(source, AL_BUFFERS_PROCESSED, &processed);
+  if (DEBUG >= 3)
+    SoundEngine::checkError("OggPlayer::update()::alGetSourceI", __LINE__);
 
   while(processed--)
@@ -184 +188 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    check();
+    if (DEBUG >= 3)
+      SoundEngine::checkError("OggPlayer::update()::unqueue", __LINE__);
 
     active = stream(buffer);
 
     alSourceQueueBuffers(source, 1, &buffer);
-    check();
+    if (DEBUG >= 3)
+      SoundEngine::checkError("OggPlayer::update()::queue", __LINE__);
   }
 
@@ -226 +232 @@
 
   alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
-  check();
+  if (DEBUG >= 3)
+    SoundEngine::checkError("OggPlayer::playback()::BUFFER", __LINE__);
 
   return true;
@@ -246 +253 @@
 
     alSourceUnqueueBuffers(source, 1, &buffer);
-    check();
+    SoundEngine::checkError("OggPlayer::empty()::unqueue Buffers", __LINE__);
   }
 }
@@ -273 +280 @@
 }
 
-/**
- * checks for errors
- */
-void OggPlayer::check()
-{
-  int error = alGetError();
-  if(error != AL_NO_ERROR)
-    PRINTF(2)("OpenAL error was raised.");
-}
 
 /**

trunk/src/lib/sound/ogg_player.h

@@ -38 +38 @@
 
 protected:
-
   bool stream(ALuint buffer);
   void empty();
-  void check();
   const char* errorString(int code);
 

trunk/src/lib/sound/sound_engine.cc

@@ -152 +152 @@
     source = this->ALSources.top();
     this->ALSources.pop();
+    printf("Retrieve Source %d\n", source);
   }
 }

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");
 }
@@ -230 +230 @@
     this->audioThread = SDL_CreateThread(GameWorld::createAudioThread, (void*)this);
 
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->playback();
+
   this->run();
 }
@@ -241 +244 @@
   PRINTF(3)("GameWorld::stop() - got stop signal\n");
   this->bRunning = false;
+
+  if (this->audioThread != NULL)
+  {
+    this->bRunning = false;
+    SDL_WaitThread(this->audioThread, NULL);
+    this->audioThread = NULL;
+  }
 
   this->audioThread = NULL;
@@ -403 +413 @@
   PNode::getNullParent()->updateNode (this->dtS);
   SoundEngine::getInstance()->update();
+
+  if (this->dataTank->music != NULL)
+    this->dataTank->music->update();
+
 }