[Scummvm-cvs-logs] CVS: scummvm/backends/dc dc.h,1.24,1.25 audio.cpp,1.13,1.14

[Marcus Comstedt]

Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28949

Modified Files:
	dc.h audio.cpp 
Log Message:
Sound buffer adjustment.

Index: dc.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/dc.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- dc.h	13 Mar 2004 17:32:28 -0000	1.24
+++ dc.h	14 Mar 2004 13:14:03 -0000	1.25
@@ -24,6 +24,7 @@
 #include <ronin/soundcommon.h>
 
 #define NUM_BUFFERS 4
+#define SOUND_BUFFER_SHIFT 3
 
 class OSystem_Dreamcast : public OSystem {
 
@@ -168,7 +169,7 @@
   void *ovl_tx[NUM_BUFFERS];
   unsigned short palette[256];
 
-  short temp_sound_buffer[RING_BUFFER_SAMPLES];
+  int temp_sound_buffer[RING_BUFFER_SAMPLES>>SOUND_BUFFER_SHIFT];
 
   void checkSound();
 

Index: audio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/audio.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- audio.cpp	14 Mar 2004 13:05:08 -0000	1.13
+++ audio.cpp	14 Mar 2004 13:14:03 -0000	1.14
@@ -32,7 +32,7 @@
   stop_sound();
   do_sound_command(CMD_SET_FREQ_EXP(FREQ_22050_EXP));
   do_sound_command(CMD_SET_STEREO(1));
-  do_sound_command(CMD_SET_BUFFER(3));
+  do_sound_command(CMD_SET_BUFFER(SOUND_BUFFER_SHIFT));
 }
 
 bool OSystem_Dreamcast::setSoundCallback(SoundProc proc, void *param)
@@ -82,7 +82,7 @@
     memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(r));
     fillpos = 0;
     n -= r;
-    memcpy4s(RING_BUF, temp_sound_buffer+(r<<1), SAMPLES_TO_BYTES(n));
+    memcpy4s(RING_BUF, temp_sound_buffer+r, SAMPLES_TO_BYTES(n));
   } else {
     memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(n));
   }