[Gnash-commit] gnash ChangeLog backend/sound_handler.h backend...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/03 06:00:15

Modified files:
        .              : ChangeLog 
        backend        : sound_handler.h sound_handler_gst.cpp 
                         sound_handler_sdl.cpp 

Log message:
                * backend/: sound_handler.h, sound_handler_gst.cpp,
                  sound_handler_sdl.cpp: Makes Nellymoser not an "unknown" 
format in
                  the error message, just unsupported, Makes GST's unknown 
format                                                                          
                      error message better (copied SDL's), Adds an assertion 
that
                  ADPCM and UNCOMPRESSED should never be passed to the sound
                  handler, Adds a comment to sound_handler.h

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3077&r2=1.3078
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.53&r2=1.54

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3077
retrieving revision 1.3078
diff -u -b -r1.3077 -r1.3078
--- ChangeLog   3 May 2007 00:43:25 -0000       1.3077
+++ ChangeLog   3 May 2007 06:00:14 -0000       1.3078
@@ -1,3 +1,12 @@
+2007-05-03 Andrew Guertin <address@hidden>
+
+       * backend/: sound_handler.h, sound_handler_gst.cpp,
+         sound_handler_sdl.cpp: Makes Nellymoser not an "unknown" format in
+         the error message, just unsupported, Makes GST's unknown format
+         error message better (copied SDL's), Adds an assertion that
+         ADPCM and UNCOMPRESSED should never be passed to the sound
+         handler, Adds a comment to sound_handler.h
+
 2007-05-02 Sandro Santilli <address@hidden>
 
        * testsuite/Makefile.am: explicitly list other gnash libs.

Index: backend/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- backend/sound_handler.h     11 Apr 2007 17:54:21 -0000      1.3
+++ backend/sound_handler.h     3 May 2007 06:00:15 -0000       1.4
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sound_handler.h,v 1.3 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: sound_handler.h,v 1.4 2007/05/03 06:00:15 strk Exp $ */
 
 /// \page sound_handler_intro Sound handler introduction
 ///
@@ -66,7 +66,7 @@
                FORMAT_RAW = 0,         // unspecified format.  Useful for 
8-bit sounds???
                FORMAT_ADPCM = 1,       // gnash doesn't pass this through; it 
uncompresses and sends FORMAT_NATIVE16
                FORMAT_MP3 = 2,
-               FORMAT_UNCOMPRESSED = 3,        // 16 bits/sample, little-endian
+               FORMAT_UNCOMPRESSED = 3,        // 16 bits/sample, 
little-endian; passed through as FORMAT_NATIVE16
                FORMAT_NELLYMOSER = 6,  // Mystery proprietary format; see 
nellymoser.com
                                
                // gnash tries to convert data to this format when possible:

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- backend/sound_handler_gst.cpp       2 May 2007 07:34:34 -0000       1.36
+++ backend/sound_handler_gst.cpp       3 May 2007 06:00:15 -0000       1.37
@@ -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_gst.cpp,v 1.36 2007/05/02 07:34:34 strk Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.37 2007/05/03 06:00:15 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -131,9 +131,21 @@
                memcpy(sounddata->data, data, data_bytes);
 
                break;
+
+       case FORMAT_ADPCM:
+       case FORMAT_UNCOMPRESSED:
+               // These should have been converted to FORMAT_NATIVE16
+               gnash::log_error("Sound data format not properly converted");
+               assert(0);
+               break;
+
+       case FORMAT_NELLYMOSER:
+               gnash::log_unimpl("Nellymoser sound format requested, gnash 
does not handle it.");
+               return -1;
+
        default:
                // Unhandled format.
-               gnash::log_error("unknown format sound requested; this demo 
does not handle it.");
+               gnash::log_error(_("unknown sound format %d requested; gnash 
does not handle it"), (int)format);
                return -1; // Unhandled format, set to NULL.
        }
 

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- backend/sound_handler_sdl.cpp       30 Apr 2007 19:13:03 -0000      1.53
+++ backend/sound_handler_sdl.cpp       3 May 2007 06:00:15 -0000       1.54
@@ -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.53 2007/04/30 19:13:03 martinwguy Exp $
+// $Id: sound_handler_sdl.cpp,v 1.54 2007/05/03 06:00:15 strk Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -133,6 +133,18 @@
 
                break;
        //case FORMAT_VORBIS:
+
+       case FORMAT_ADPCM:
+       case FORMAT_UNCOMPRESSED:
+               // These should have been converted to FORMAT_NATIVE16
+               gnash::log_error(_("Sound data format not properly converted"));
+               assert(0);
+               break;
+
+       case FORMAT_NELLYMOSER:
+               gnash::log_unimpl("Nellymoser sound format requested, gnash 
does not handle it.");
+               return -1;
+
        default:
                // Unhandled format.
                gnash::log_error(_("unknown sound format %d requested; gnash 
does not handle it"), (int)format);