[Scummvm-cvs-logs] CVS: scummvm/backends/dc audio.cpp,1.12,1.13

[Marcus Comstedt]

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

Modified Files:
	audio.cpp 
Log Message:
In stereo.

Index: audio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/audio.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- audio.cpp	13 Mar 2004 13:41:50 -0000	1.12
+++ audio.cpp	14 Mar 2004 13:05:08 -0000	1.13
@@ -25,12 +25,13 @@
 #include "base/engine.h"
 #include "dc.h"
 
-EXTERN_C void *memcpy4(void *s1, const void *s2, unsigned int n);
+EXTERN_C void *memcpy4s(void *s1, const void *s2, unsigned int n);
 
 void initSound()
 {
   stop_sound();
-  do_sound_command(CMD_SET_FREQ_EXP(FREQ_44100_EXP));
+  do_sound_command(CMD_SET_FREQ_EXP(FREQ_22050_EXP));
+  do_sound_command(CMD_SET_STEREO(1));
   do_sound_command(CMD_SET_BUFFER(3));
 }
 
@@ -74,16 +75,16 @@
     return;
 
   _sound_proc(_sound_proc_param, (byte*)temp_sound_buffer,
-	      SAMPLES_TO_BYTES(n));
+	      2*SAMPLES_TO_BYTES(n));
 
   if(fillpos+n > curr_ring_buffer_samples) {
     int r = curr_ring_buffer_samples - fillpos;
-    memcpy4(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(r));
+    memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(r));
     fillpos = 0;
     n -= r;
-    memcpy4(RING_BUF, temp_sound_buffer+r, SAMPLES_TO_BYTES(n));
+    memcpy4s(RING_BUF, temp_sound_buffer+(r<<1), SAMPLES_TO_BYTES(n));
   } else {
-    memcpy4(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(n));
+    memcpy4s(RING_BUF+fillpos, temp_sound_buffer, SAMPLES_TO_BYTES(n));
   }
   if((fillpos += n) >= curr_ring_buffer_samples)
     fillpos = 0;
@@ -91,6 +92,6 @@
 
 int OSystem_Dreamcast::getOutputSampleRate() const
 {
-  return 22050;
+  return read_sound_int(&SOUNDSTATUS->freq);
 }