[Gnash-commit] gnash backend/sound_handler_sdl.cpp ChangeLog

[Martin Guy]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Martin Guy <martinwguy> 07/05/18 15:28:02

Modified files:
        backend        : sound_handler_sdl.cpp 
        .              : ChangeLog 

Log message:
                * backend/sound_handler_sdl.cpp: Remove bug 19750 that garbled
                  SOUNDSTREAM audio.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3272&r2=1.3273

Patches:
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- backend/sound_handler_sdl.cpp       18 May 2007 13:17:51 -0000      1.59
+++ backend/sound_handler_sdl.cpp       18 May 2007 15:28:01 -0000      1.60
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.59 2007/05/18 13:17:51 martinwguy Exp $
+// $Id: sound_handler_sdl.cpp,v 1.60 2007/05/18 15:28:01 martinwguy Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -167,14 +167,16 @@
                int16_t*        adjusted_data = 0;
                int     adjusted_size = 0;
 
-               convert_raw_data(&adjusted_data, &adjusted_size, data, 
sample_count, 2, sounddata->sample_rate, sounddata->stereo,
-                                audioSpec.freq, (audioSpec.channels == 2 ? 
true : false));
+               convert_raw_data(&adjusted_data, &adjusted_size,
+                                data, sample_count, 2 /*sample size*/,
+                                sounddata->sample_rate, sounddata->stereo,
+                                audioSpec.freq, (audioSpec.channels == 2));
                if (!adjusted_data || adjusted_size < 1) {
                        gnash::log_error(_("Some kind of error with resampling 
sound data"));
                        return -1;
                }
-               adjusted_data = static_cast<int16_t*>(data);
-               adjusted_size = data_bytes;
+               // adjusted_data = static_cast<int16_t*>(data);
+               // adjusted_size = data_bytes;
 
                // Reallocate the required memory.
                Uint8* tmp_data = new Uint8[adjusted_size + 
sounddata->data_size];

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3272
retrieving revision 1.3273
diff -u -b -r1.3272 -r1.3273
--- ChangeLog   18 May 2007 14:28:11 -0000      1.3272
+++ ChangeLog   18 May 2007 15:28:02 -0000      1.3273
@@ -2,7 +2,6 @@
 
        * backend/sound_handler.cpp: Include cstring so memcpy is
        defined.
-
        * libbase/Makefile.am: Add makefile rules from libltd.
 
 2007-05-18 Sandro Santilli <address@hidden>
@@ -58,6 +57,8 @@
          convert_raw_samples is now just a static fn of sound_handler::
        * backend/sound_handler.cpp: Speed convert_raw_data and handle stereo
          upsampling correctly
+       * backend/sound_handler_sdl.cpp: Remove bug 19750 that garbled
+         SOUNDSTREAM audio.
 
 2007-05-17  Rob Savoye  <address@hidden>