Changeset 7301 in orxonox.OLD for trunk

Timestamp:

Apr 16, 2006, 7:51:18 PM (19 years ago)

Author:

bensch

Message:

less debug, and music should rewind now

Location:

trunk/src/lib

Files:

• particles/particle_system.cc (modified) (1 diff)
• sound/ogg_player.cc (modified) (3 diffs)
• sound/ogg_player.h (modified) (1 diff)

trunk/src/lib/particles/particle_system.cc

@@ -14 +14 @@
 */
 
-#define DEBUG_SPECIAL_MODULE 5 //DEBUG_MODULE_GRAPHICS
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GRAPHICS
 
 #include "particle_system.h"

trunk/src/lib/sound/ogg_player.cc

@@ -69 +69 @@
   if (this->buffers[0] != 0 && this->buffers[1] != 0)
     state |= BuffersAllocated;
-  else  {
+  else
+  {
     PRINTF(2)("Unable to allocate al-Buffers\n");
     this->release();
@@ -252 +253 @@
   if (unlikely(!(this->state & Playing)))
     return false;
-  char pcm[BUFFER_SIZE];
+  char pcm[OGG_PLAYER_BUFFER_SIZE];
   int  size = 0;
   int  section;
   int  result;
 
-  while(size < BUFFER_SIZE)
-  {
-    result = ov_read(&oggStream, pcm + size, BUFFER_SIZE - size, 0, 2, 1, &section);
+  while(size < OGG_PLAYER_BUFFER_SIZE)
+  {
+    result = ov_read(&this->oggStream, pcm + size, OGG_PLAYER_BUFFER_SIZE - size, 0, 2, 1, &section);
 
     if(result > 0)
       size += result;
-    else
-      if(result < 0)
-        throw errorString(result);
-      else
-        break;
+    else if(result < 0)
+      throw errorString(result);
+    else /* eof */
+      ov_time_seek(&this->oggStream, 0.0);
   }
 
@@ -327 +327 @@
   PRINTF(0)("OggPlayer is in the following States: ");
   if (this->state & FileOpened)
-      PRINT(0)("FileOpened ");
+    PRINT(0)("FileOpened ");
   if (this->state & SourceAllocated)
     PRINT(0)("SourceAllocated ");

trunk/src/lib/sound/ogg_player.h

@@ -19 +19 @@
 
 
-#define BUFFER_SIZE (8096 * 2)
+#define OGG_PLAYER_BUFFER_SIZE (8096 * 2)