fix rrds warning, add bxaimc's tiny toon adventures: defenders of the universe meta

git-svn-id: https://vgmstream.svn.sourceforge.net/svnroot/vgmstream@588 51a99a44-fe44-0410-b1ba-c3e57ba2b86b

src/meta/meta.h

@@ -344,4 +344,6 @@ VGMSTREAM * init_vgmstream_nds_rrds(STREAMFILE *streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_tk5(STREAMFILE *streamFile);
 
+VGMSTREAM * init_vgmstream_ps2_vsf_tta(STREAMFILE *streamFile);
+
 #endif

src/meta/nds_rrds.c

@@ -7,7 +7,6 @@
 VGMSTREAM * init_vgmstream_nds_rrds(STREAMFILE *streamFile) {
     VGMSTREAM * vgmstream = NULL;
     char filename[260];
-    int codec_number;
     int channel_count;
     int loop_flag;
     off_t start_offset;
@@ -64,4 +63,4 @@ VGMSTREAM * init_vgmstream_nds_rrds(STREAMFILE *streamFile) {
 fail:
     if (vgmstream) close_vgmstream(vgmstream);
     return NULL;
-}
+}

src/meta/vsf.c

@@ -64,3 +64,67 @@ fail:
     if (vgmstream) close_vgmstream(vgmstream);
     return NULL;
 }
+
+/* VSF with SMSS header (from Tiny Toon Adventures: Defenders of the Universe */
+VGMSTREAM * init_vgmstream_ps2_vsf_tta(STREAMFILE *streamFile) {
+    VGMSTREAM * vgmstream = NULL;
+    char filename[260];
+    off_t start_offset;
+
+    int loop_flag;
+   int channel_count;
+
+    /* check extension, case insensitive */
+    streamFile->get_name(streamFile,filename,sizeof(filename));
+    if (strcasecmp("vsf",filename_extension(filename))) goto fail;
+
+    /* check header */
+    if (read_32bitBE(0x00,streamFile) != 0x534D5353) /* "SMSS" */
+        goto fail;
+
+
+    loop_flag = read_32bitLE(0x18,streamFile);
+    channel_count = read_32bitLE(0x0c,streamFile);
+    
+   /* build the VGMSTREAM */
+    vgmstream = allocate_vgmstream(channel_count,loop_flag);
+    if (!vgmstream) goto fail;
+
+   /* fill in the vital statistics */
+    start_offset = 0x800;
+   vgmstream->channels = channel_count;
+    vgmstream->sample_rate = read_32bitLE(0x10,streamFile);
+    vgmstream->coding_type = coding_PSX;
+    vgmstream->num_samples = (get_streamfile_size(streamFile)-0x800)*28/16/channel_count;
+    if (loop_flag) {
+        vgmstream->loop_start_sample = (read_32bitLE(0x18,streamFile)*2)*28/16/channel_count;
+       vgmstream->loop_end_sample = (read_32bitLE(0x1c,streamFile)*2)*28/16/channel_count;
+    }
+
+    vgmstream->layout_type = layout_interleave;
+    vgmstream->interleave_block_size = read_32bitLE(0x8,streamFile);
+    vgmstream->meta_type = meta_PS2_VSF_TTA;
+
+    /* open the file for reading */
+    {
+        int i;
+        STREAMFILE * file;
+        file = streamFile->open(streamFile,filename,STREAMFILE_DEFAULT_BUFFER_SIZE);
+        if (!file) goto fail;
+        for (i=0;i<channel_count;i++) {
+            vgmstream->ch[i].streamfile = file;
+
+            vgmstream->ch[i].channel_start_offset=
+                vgmstream->ch[i].offset=start_offset+
+                vgmstream->interleave_block_size*i;
+
+        }
+    }
+
+    return vgmstream;
+
+    /* clean up anything we may have opened */
+fail:
+    if (vgmstream) close_vgmstream(vgmstream);
+    return NULL;
+}

src/vgmstream.c

@@ -192,6 +192,7 @@ VGMSTREAM * (*init_vgmstream_fcns[])(STREAMFILE *streamFile) = {
     init_vgmstream_ps2_vsf,
 	init_vgmstream_nds_rrds,
 	init_vgmstream_ps2_tk5,
+	init_vgmstream_ps2_vsf_tta,
 };
 
 #define INIT_VGMSTREAM_FCNS (sizeof(init_vgmstream_fcns)/sizeof(init_vgmstream_fcns[0]))
@@ -2073,6 +2074,9 @@ void describe_vgmstream(VGMSTREAM * vgmstream, char * desc, int length) {
        case meta_PS2_TK5:
             snprintf(temp,TEMPSIZE,"Tekken 5 Stream Header");
             break;
+       case meta_PS2_VSF_TTA:
+		   snprintf(temp,TEMPSIZE,"VSF with SMSS Header");
+            break;
         default:
             snprintf(temp,TEMPSIZE,"THEY SHOULD HAVE SENT A POET");
     }

src/vgmstream.h

@@ -310,6 +310,7 @@ typedef enum {
     meta_EMFF_NGC,			/* Eidos Music File Format for NGC/WII */
     meta_SAT_BAKA,			/* Crypt Killer */
     meta_PS2_VSF,           /* Musashi: Samurai Legend */
+	meta_PS2_VSF_TTA,       /* Tiny Toon Adventures: Defenders of the Universe */
 
     meta_XBOX_WAVM,			/* XBOX WAVM File */
     meta_XBOX_RIFF,			/* XBOX RIFF/WAVE File */