remove fake format .ccc (use .txth)

doc/FORMATS.md

@@ -10,7 +10,6 @@ This list is not complete and many other files are supported.
 	- .ast
 	- .bg00
 	- .bmdx
-	- .ccc
 	- .cnk
 	- .enth
 	- .fag
@@ -39,7 +38,6 @@ This list is not complete and many other files are supported.
 	- .rnd
 	- .rstm
 	- .rws
-	- .rxw
 	- .snd
 	- .sfs
 	- .sl3

src/formats.c

@@ -134,7 +134,6 @@ static const char* extension_list[] = {
     "cads",
     "caf",
     "cbd2",
-    "ccc", //fake extension (to be removed)
     "cd",
     "cfn", //fake extension for CAF (renamed, to be removed?)
     "chd", //txth/reserved [Donkey Konga (GC), Star Fox Assault (GC)]
@@ -440,7 +439,6 @@ static const char* extension_list[] = {
     "rws",
     "rwsd",
     "rwx",
-    "rxw",
     "rxx", //txth/reserved [Full Auto (X360)]
 
     "s14",

src/libvgmstream.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -530,7 +530,6 @@
     <ClCompile Include="meta\ps2_b1s.c" />
     <ClCompile Include="meta\ps2_bg00.c" />
     <ClCompile Include="meta\ps2_bmdx.c" />
-    <ClCompile Include="meta\ps2_ccc.c" />
     <ClCompile Include="meta\ps2_enth.c" />
     <ClCompile Include="meta\ps2_filp.c" />
     <ClCompile Include="meta\ps2_gbts.c" />

src/libvgmstream.vcxproj.filters

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
@@ -1411,9 +1411,6 @@
     <ClCompile Include="meta\ps2_bmdx.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="meta\ps2_ccc.c">
-      <Filter>meta\Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="meta\ps2_enth.c">
       <Filter>meta\Source Files</Filter>
     </ClCompile>

src/meta/meta.h

@@ -298,8 +298,6 @@ VGMSTREAM * init_vgmstream_ngc_ymf(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_sadl(STREAMFILE * streamFile);
 
-VGMSTREAM * init_vgmstream_ps2_ccc(STREAMFILE * streamFile);
-
 VGMSTREAM * init_vgmstream_fag(STREAMFILE * streamFile);
 
 VGMSTREAM * init_vgmstream_ps2_mihb(STREAMFILE * streamFile);

src/meta/ps2_ccc.c

@@ -1,68 +0,0 @@
-#include "meta.h"
-#include "../util.h"
-
-/* CCC */
-VGMSTREAM * init_vgmstream_ps2_ccc(STREAMFILE *streamFile) {
-    VGMSTREAM * vgmstream = NULL;
-    char filename[PATH_LIMIT];
-    off_t start_offset;
-    int loop_flag = 0;
-	int channel_count;
-
-    /* check extension, case insensitive */
-    streamFile->get_name(streamFile,filename,sizeof(filename));
-    if (strcasecmp("ccc",filename_extension(filename))) goto fail;
-
-    /* check header */
-    if (read_32bitBE(0x00,streamFile) != 0x01000000)
-        goto fail;
-    
-    /* check file size */
-    if (read_32bitLE(0x0C,streamFile)+0x50 != get_streamfile_size(streamFile))
-        goto fail;
-    
-    loop_flag = 0;
-    channel_count = 2;
-    
-	/* build the VGMSTREAM */
-    vgmstream = allocate_vgmstream(channel_count,loop_flag);
-    if (!vgmstream) goto fail;
-
-	/* fill in the vital statistics */
-    start_offset = 0x50;
-	vgmstream->channels = channel_count;
-    vgmstream->sample_rate = read_32bitLE(0x04,streamFile);
-    vgmstream->coding_type = coding_PSX;
-    vgmstream->num_samples = (read_32bitLE(0x08,streamFile))/channel_count/0x10*28;
-    if (loop_flag) {
-        vgmstream->loop_start_sample = 0;
-        vgmstream->loop_end_sample = (read_32bitLE(0x08,streamFile))/channel_count/0x10*28;
-    }
-
-    vgmstream->layout_type = layout_interleave;
-    vgmstream->interleave_block_size = 0x2000;
-    vgmstream->meta_type = meta_PS2_CCC;
-
-    /* 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

@@ -555,7 +555,6 @@ VGMSTREAM* (*init_vgmstream_functions[])(STREAMFILE* sf) = {
     init_vgmstream_ngc_ulw,         /* .ulw raw u-Law */
     init_vgmstream_exakt_sc,        /* .sc raw PCM */
     init_vgmstream_zwdsp,           /* fake format */
-    init_vgmstream_ps2_ccc,         /* fake format, to be removed */
     init_vgmstream_ps2_adm,         /* weird non-constant PSX blocks */
     init_vgmstream_rwsd,            /* crap, to be removed */
 #ifdef VGM_USE_FFMPEG

vspf.py

@@ -12,7 +12,7 @@
 
 import os, glob
 
-TEST_OUTPUT = True
+TEST_OUTPUT = False
 BASE_SRC_PATH = '.'
 
 class ProjectFixer: