Mercurial > SDL_sound_CoreAudio

changeset 294:9828311da44b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor cleanups.
author Ryan C. Gordon <icculus@icculus.org>
date Sun, 17 Mar 2002 21:17:23 +0000
parents ee6e1f8bfae9
children 5a7d5055823d
files decoders/au.c decoders/smpeg.c
diffstat 2 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/decoders/au.c	Sun Mar 17 21:17:09 2002 +0000
+++ b/decoders/au.c	Sun Mar 17 21:17:23 2002 +0000
@@ -140,7 +140,7 @@
     r = SDL_RWread(rw, &hdr, 1, HDR_SIZE);
     if (r < HDR_SIZE)
     {
-        Sound_SetError("No .au file (bad header)");
+        Sound_SetError("AU: Not an .au file (bad header)");
         free(dec);
         return(0);
     } /* if */
@@ -167,7 +167,7 @@
                 break;
 
             default:
-                Sound_SetError("Unsupported .au encoding");
+                Sound_SetError("AU: Unsupported .au encoding");
                 free(dec);
                 return 0;
         } /* switch */
@@ -202,7 +202,7 @@
 
     else
     {
-        SNDDBG(("AU: Not an .AU stream.\n"));
+        Sound_SetError("AU: Not an .AU stream.");
         free(dec);
         return(0);
     } /* else */
--- a/decoders/smpeg.c	Sun Mar 17 21:17:09 2002 +0000
+++ b/decoders/smpeg.c	Sun Mar 17 21:17:23 2002 +0000
@@ -144,16 +144,10 @@
         Uint8 mp3_magic[2];
 
         if (SDL_RWread(internal->rw, mp3_magic, sizeof (mp3_magic), 1) != 1)
-        {
-            Sound_SetError("SMPEG: Could not read MP3 magic.");
-            return(0);
-        } /*if */
+            BAIL_MACRO("MP3: Could not read MP3 magic.", 0);
 
         if (mp3_magic[0] != 0xFF || (mp3_magic[1] & 0xF0) != 0xF0)
-        {
-            Sound_SetError("SMPEG: Not an MP3 stream.");
-            return(0);
-        } /* if */
+            BAIL_MACRO("MP3: Not an MP3 stream.", 0);
 
             /* !!! FIXME: If the seek fails, we'll probably miss a frame */
         SDL_RWseek(internal->rw, -sizeof (mp3_magic), SEEK_CUR);