# HG changeset patch
# User Ryan C. Gordon <icculus@icculus.org>
# Date 1001161738 0
# Node ID 0d5ff56795235e615884b6e9a16091b5304fde47
# Parent  c15396fc0e55ea0e9526eb8fe22221d39f7a289e
Cleanups from Torbj�rn Andersson.

diff -r c15396fc0e55 -r 0d5ff5679523 decoders/aiff.c
--- a/decoders/aiff.c	Thu Sep 20 07:57:52 2001 +0000
+++ b/decoders/aiff.c	Sat Sep 22 12:28:58 2001 +0000
@@ -179,7 +179,8 @@
         return(0);
     comm->numChannels = SDL_SwapBE16(comm->numChannels);
 
-    if (SDL_RWread(rw, &comm->numSampleFrames, sizeof (comm->numSampleFrames), 1) != 1)
+    if (SDL_RWread(rw, &comm->numSampleFrames,
+                   sizeof (comm->numSampleFrames), 1) != 1)
         return(0);
     comm->numSampleFrames = SDL_SwapBE32(comm->numSampleFrames);
 
@@ -187,7 +188,7 @@
         return(0);
     comm->sampleSize = SDL_SwapBE16(comm->sampleSize);
 
-    if (SDL_RWread(rw, sampleRate, sizeof(sampleRate), 1) != 1)
+    if (SDL_RWread(rw, sampleRate, sizeof (sampleRate), 1) != 1)
         return(0);
     comm->sampleRate = SANE_to_Uint32(sampleRate);
 
@@ -196,7 +197,8 @@
                          + sizeof(comm->sampleSize)
                          + sizeof(sampleRate))
     {
-        if (SDL_RWread(rw, &comm->compressionType, sizeof (comm->compressionType), 1) != 1)
+        if (SDL_RWread(rw, &comm->compressionType,
+                       sizeof (comm->compressionType), 1) != 1)
             return(0);
         comm->compressionType = SDL_SwapBE32(comm->compressionType);
     } /* if */
@@ -228,16 +230,17 @@
         return(0);
     ssnd->ckDataSize = SDL_SwapBE32(ssnd->ckDataSize);
 
-    if (SDL_RWread(rw, &ssnd->offset, sizeof(ssnd->offset), 1) != 1)
+    if (SDL_RWread(rw, &ssnd->offset, sizeof (ssnd->offset), 1) != 1)
         return(0);
     ssnd->offset = SDL_SwapBE32(ssnd->offset);
 
-    if (SDL_RWread(rw, &ssnd->blockSize, sizeof(ssnd->blockSize), 1) != 1)
+    if (SDL_RWread(rw, &ssnd->blockSize, sizeof (ssnd->blockSize), 1) != 1)
         return(0);
     ssnd->blockSize = SDL_SwapBE32(ssnd->blockSize);
 
     /* Leave the SDL_RWops position indicator at the start of the samples */
-    if (SDL_RWseek(rw, (int) ssnd->offset, SEEK_CUR) == -1) /* !!! FIXME: Int? Really? */
+    /* !!! FIXME: Int? Really? */
+    if (SDL_RWseek(rw, (int) ssnd->offset, SEEK_CUR) == -1)
         return(0);
 
     return(1);
@@ -287,10 +290,12 @@
     pos = SDL_RWtell(rw);
 
     BAIL_IF_MACRO(!find_chunk(rw, commID), "AIFF: No common chunk.", 0);
-    BAIL_IF_MACRO(!read_comm_chunk(rw, &c), "AIFF: Can't read common chunk.", 0);
+    BAIL_IF_MACRO(!read_comm_chunk(rw, &c),
+                  "AIFF: Can't read common chunk.", 0);
 
     /* !!! FIXME: This will have to change for compression types... */
-    BAIL_IF_MACRO(c.compressionType != noneID, "AIFF: Unsupported encoding.", 0);
+    BAIL_IF_MACRO(c.compressionType != noneID,
+                  "AIFF: Unsupported encoding.", 0);
 
     BAIL_IF_MACRO(c.sampleRate == 0, "AIFF: Unsupported sample rate.", 0);
 
@@ -313,13 +318,16 @@
     SDL_RWseek(rw, pos, SEEK_SET);
 
     BAIL_IF_MACRO(!find_chunk(rw, ssndID), "AIFF: No sound data chunk.", 0);
-    BAIL_IF_MACRO(!read_ssnd_chunk(rw, &s), "AIFF: Can't read sound data chunk.", 0);
+    BAIL_IF_MACRO(!read_ssnd_chunk(rw, &s),
+                  "AIFF: Can't read sound data chunk.", 0);
 
     a = (aiff_t *) malloc(sizeof(aiff_t));
     BAIL_IF_MACRO(a == NULL, ERR_OUT_OF_MEMORY, 0);
     a->bytesLeft = bytes_per_sample * c.numSampleFrames;
     internal->decoder_private = (void *) a;
 
+    sample->flags = SOUND_SAMPLEFLAG_NONE;
+
     _D(("AIFF: Accepting data stream.\n"));
     return(1); /* we'll handle this data. */
 } /* AIFF_open */