Changeset 7296 in orxonox.OLD

Timestamp:

Apr 14, 2006, 1:45:05 PM (18 years ago)

Author:

bensch

Message:

nicer code

Location:

trunk/src

Files:

• lib/sound/ogg_player.cc (modified) (7 diffs)
• story_entities/game_world.cc (modified) (1 diff)

trunk/src/lib/sound/ogg_player.cc

@@ -59 +59 @@
 bool OggPlayer::open(const std::string& fileName)
 {
-  // release old State
-  if (state & FileOpened)
-    release();
+  // release old Ogg-File
+  if (this->state & FileOpened)
+    this->release();
 
   // allocating Buffers
@@ -81 +81 @@
   else
   {
-    PRINTF(2)("No more Sources Availiable (maybe you should consider raising the source-count\n");
+    PRINTF(2)("No more Sources Availiable (maybe you should consider raising the source-count.)\n");
     this->release();
     return false;
@@ -119 +119 @@
   alSourcei (source, AL_SOURCE_RELATIVE, AL_TRUE      );
   alSourcef (source, AL_GAIN,            SoundEngine::getInstance()->getMusicVolume());
-  SoundEngine::checkError("OggPlayer::SetSourceProperties", __LINE__);
+  SoundEngine::checkError("OggPlayer::open()::SetSourceProperties", __LINE__);
 
   return true;
@@ -125 +125 @@
 
 /**
- * releases a stream
+ * @brief releases a stream
  */
 void OggPlayer::release()
@@ -175 +175 @@
   this->state |= Playing;
 
-  if(!stream(buffers[0]) || !stream(buffers[1]))
+  if(!this->stream(this->buffers[0]) || !this->stream(this->buffers[1]))
     return false;
 
@@ -181 +181 @@
   if (DEBUG >= 3)
     SoundEngine::checkError("OggPlayer::playback()::alSourceQueueBuffers", __LINE__);
+  if (!alIsBuffer(this->buffers[0])) printf("AHA0\n");
+  if (!alIsBuffer(this->buffers[1])) printf("AHA1\n");
+
+  if (!alIsSource(this->source)) printf("AHA2\n");
+  SoundEngine::checkError("SKJFLKSDJF",__LINE__);
+
   alSourcePlay(this->source);
   if (DEBUG >= 3)
@@ -268 +274 @@
   alBufferData(buffer, format, pcm, size, vorbisInfo->rate);
   if (DEBUG >= 3)
-    SoundEngine::checkError("OggPlayer::playback()::BUFFER", __LINE__);
+    SoundEngine::checkError("OggPlayer::stream()::BUFFER", __LINE__);
 
   return true;

trunk/src/story_entities/game_world.cc

@@ -147 +147 @@
     SDL_Delay(1);
   }*/
-  printf("End the AudioThread\n");
+  //printf("End the AudioThread\n");
 }