sm64

A Super Mario 64 decompilation
Log | Files | Refs | README | LICENSE

audiofile_strip.patch (8291B)


      1 diff --git a/libaudiofile/FileHandle.cpp b/libaudiofile/FileHandle.cpp
      2 index 8562d4b..5d6342a 100644
      3 --- a/libaudiofile/FileHandle.cpp
      4 +++ b/libaudiofile/FileHandle.cpp
      5 @@ -74,26 +74,8 @@ _AFfilehandle *_AFfilehandle::create(int fileFormat)
      6  		case AF_FILE_AIFF:
      7  		case AF_FILE_AIFFC:
      8  			return new AIFFFile();
      9 -		case AF_FILE_NEXTSND:
     10 -			return new NeXTFile();
     11  		case AF_FILE_WAVE:
     12  			return new WAVEFile();
     13 -		case AF_FILE_BICSF:
     14 -			return new IRCAMFile();
     15 -		case AF_FILE_AVR:
     16 -			return new AVRFile();
     17 -		case AF_FILE_IFF_8SVX:
     18 -			return new IFFFile();
     19 -		case AF_FILE_SAMPLEVISION:
     20 -			return new SampleVisionFile();
     21 -		case AF_FILE_VOC:
     22 -			return new VOCFile();
     23 -		case AF_FILE_NIST_SPHERE:
     24 -			return new NISTFile();
     25 -		case AF_FILE_CAF:
     26 -			return new CAFFile();
     27 -		case AF_FILE_FLAC:
     28 -			return new FLACFile();
     29  		default:
     30  			return NULL;
     31  	}
     32 diff --git a/libaudiofile/aupv.c b/libaudiofile/aupv.c
     33 index 64e798b..374838b 100644
     34 --- a/libaudiofile/aupv.c
     35 +++ b/libaudiofile/aupv.c
     36 @@ -47,7 +47,7 @@ AUpvlist AUpvnew (int maxitems)
     37  	if (aupvlist == NULL)
     38  		return AU_NULL_PVLIST;
     39  
     40 -	aupvlist->items = calloc(maxitems, sizeof (struct _AUpvitem));
     41 +	aupvlist->items = (struct _AUpvitem *)calloc(maxitems, sizeof (struct _AUpvitem));
     42  
     43  	assert(aupvlist->items);
     44  	if (aupvlist->items == NULL)
     45 diff --git a/libaudiofile/g711.c b/libaudiofile/g711.c
     46 index 8fb2323..1b323ec 100644
     47 --- a/libaudiofile/g711.c
     48 +++ b/libaudiofile/g711.c
     49 @@ -74,8 +74,7 @@ static int search(int val, const short *table, int size)
     50   * John Wiley & Sons, pps 98-111 and 472-476.
     51   */
     52  unsigned char
     53 -_af_linear2alaw(pcm_val)
     54 -	int		pcm_val;	/* 2's complement (16-bit range) */
     55 +_af_linear2alaw(int	pcm_val)
     56  {
     57  	int		mask;
     58  	int		seg;
     59 @@ -110,8 +109,7 @@ _af_linear2alaw(pcm_val)
     60   *
     61   */
     62  int
     63 -_af_alaw2linear(a_val)
     64 -	unsigned char	a_val;
     65 +_af_alaw2linear(unsigned char	a_val)
     66  {
     67  	int		t;
     68  	int		seg;
     69 diff --git a/libaudiofile/units.cpp b/libaudiofile/units.cpp
     70 index ffd0a63..51d2dc3 100644
     71 --- a/libaudiofile/units.cpp
     72 +++ b/libaudiofile/units.cpp
     73 @@ -32,24 +32,12 @@
     74  #include "units.h"
     75  
     76  #include "AIFF.h"
     77 -#include "AVR.h"
     78 -#include "CAF.h"
     79 -#include "FLACFile.h"
     80 -#include "IFF.h"
     81 -#include "IRCAM.h"
     82 -#include "NeXT.h"
     83 -#include "NIST.h"
     84  #include "Raw.h"
     85 -#include "SampleVision.h"
     86 -#include "VOC.h"
     87  #include "WAVE.h"
     88  
     89  #include "compression.h"
     90  
     91 -#include "modules/ALAC.h"
     92 -#include "modules/FLAC.h"
     93  #include "modules/G711.h"
     94 -#include "modules/IMA.h"
     95  #include "modules/MSADPCM.h"
     96  #include "modules/PCM.h"
     97  
     98 @@ -99,20 +87,6 @@ const Unit _af_units[_AF_NUM_UNITS] =
     99  		_AF_AIFF_NUM_INSTPARAMS,
    100  		_af_aiff_inst_params
    101  	},
    102 -	{
    103 -		AF_FILE_NEXTSND,
    104 -		"NeXT .snd/Sun .au", "NeXT .snd/Sun .au Format", "next",
    105 -		true,
    106 -		NeXTFile::completeSetup,
    107 -		NeXTFile::recognize,
    108 -		AF_SAMPFMT_TWOSCOMP, 16,
    109 -		_AF_NEXT_NUM_COMPTYPES,
    110 -		_af_next_compression_types,
    111 -		0,	/* maximum marker count */
    112 -		0,	/* maximum instrument count */
    113 -		0,	/* maximum number of loops per instrument */
    114 -		0, NULL
    115 -	},
    116  	{
    117  		AF_FILE_WAVE,
    118  		"MS RIFF WAVE", "Microsoft RIFF WAVE Format", "wave",
    119 @@ -128,144 +102,6 @@ const Unit _af_units[_AF_NUM_UNITS] =
    120  		_AF_WAVE_NUM_INSTPARAMS,
    121  		_af_wave_inst_params
    122  	},
    123 -	{
    124 -		AF_FILE_IRCAM,
    125 -		"BICSF", "Berkeley/IRCAM/CARL Sound Format", "bicsf",
    126 -		true,
    127 -		IRCAMFile::completeSetup,
    128 -		IRCAMFile::recognize,
    129 -		AF_SAMPFMT_TWOSCOMP, 16,
    130 -		_AF_IRCAM_NUM_COMPTYPES,
    131 -		_af_ircam_compression_types,
    132 -		0,		// maximum marker count
    133 -		0,		// maximum instrument count
    134 -		0,		// maximum number of loops per instrument
    135 -		0,		// number of instrument parameters
    136 -		NULL	// instrument parameters
    137 -	},
    138 -	{
    139 -		AF_FILE_MPEG1BITSTREAM,
    140 -		"MPEG", "MPEG Audio Bitstream", "mpeg",
    141 -		false
    142 -	},
    143 -	{
    144 -		AF_FILE_SOUNDDESIGNER1,
    145 -		"Sound Designer 1", "Sound Designer 1 File Format", "sd1",
    146 -		false
    147 -	},
    148 -	{
    149 -		AF_FILE_SOUNDDESIGNER2,
    150 -		"Sound Designer 2", "Sound Designer 2 File Format", "sd2",
    151 -		false
    152 -	},
    153 -	{
    154 -		AF_FILE_AVR,
    155 -		"AVR", "Audio Visual Research File Format", "avr",
    156 -		true,
    157 -		AVRFile::completeSetup,
    158 -		AVRFile::recognize,
    159 -		AF_SAMPFMT_TWOSCOMP, 16,
    160 -		0,	/* number of compression types */
    161 -		NULL,	/* compression types */
    162 -		0,	/* maximum marker count */
    163 -		0,	/* maximum instrument count */
    164 -		0,	/* maximum number of loops per instrument */
    165 -		0,	/* number of instrument parameters */
    166 -	},
    167 -	{
    168 -		AF_FILE_IFF_8SVX,
    169 -		"IFF/8SVX", "Amiga IFF/8SVX Sound File Format", "iff",
    170 -		true,
    171 -		IFFFile::completeSetup,
    172 -		IFFFile::recognize,
    173 -		AF_SAMPFMT_TWOSCOMP, 8,
    174 -		0,	/* number of compression types */
    175 -		NULL,	/* compression types */
    176 -		0,	/* maximum marker count */
    177 -		0,	/* maximum instrument count */
    178 -		0,	/* maximum number of loops per instrument */
    179 -		0,	/* number of instrument parameters */
    180 -	},
    181 -	{
    182 -		AF_FILE_SAMPLEVISION,
    183 -		"Sample Vision", "Sample Vision File Format", "smp",
    184 -		true,
    185 -		SampleVisionFile::completeSetup,
    186 -		SampleVisionFile::recognize,
    187 -		AF_SAMPFMT_TWOSCOMP, 16,
    188 -		0,		// number of compression types
    189 -		NULL,	// compression types
    190 -		0,		// maximum marker count
    191 -		0,		// maximum instrument count
    192 -		0,		// maximum number of loops per instrument
    193 -		0,		// number of instrument parameters
    194 -		NULL	// instrument parameters
    195 -	},
    196 -	{
    197 -		AF_FILE_VOC,
    198 -		"VOC", "Creative Voice File Format", "voc",
    199 -		true,
    200 -		VOCFile::completeSetup,
    201 -		VOCFile::recognize,
    202 -		AF_SAMPFMT_TWOSCOMP, 16,
    203 -		_AF_VOC_NUM_COMPTYPES,
    204 -		_af_voc_compression_types,
    205 -		0,		// maximum marker count
    206 -		0,		// maximum instrument count
    207 -		0,		// maximum number of loops per instrument
    208 -		0,		// number of instrument parameters
    209 -		NULL	// instrument parameters
    210 -	},
    211 -	{
    212 -		AF_FILE_NIST_SPHERE,
    213 -		"NIST SPHERE", "NIST SPHERE File Format", "nist",
    214 -		true,
    215 -		NISTFile::completeSetup,
    216 -		NISTFile::recognize,
    217 -		AF_SAMPFMT_TWOSCOMP, 16,
    218 -		0,	/* number of compression types */
    219 -		NULL,	/* compression types */
    220 -		0,	/* maximum marker count */
    221 -		0,	/* maximum instrument count */
    222 -		0,	/* maximum number of loops per instrument */
    223 -		0,	/* number of instrument parameters */
    224 -		NULL	/* instrument parameters */
    225 -	},
    226 -	{
    227 -		AF_FILE_SOUNDFONT2,
    228 -		"SoundFont 2", "SoundFont 2 File Format", "sf2",
    229 -		false
    230 -	},
    231 -	{
    232 -		AF_FILE_CAF,
    233 -		"CAF", "Core Audio Format", "caf",
    234 -		true,
    235 -		CAFFile::completeSetup,
    236 -		CAFFile::recognize,
    237 -		AF_SAMPFMT_TWOSCOMP, 16,
    238 -		_AF_CAF_NUM_COMPTYPES,
    239 -		_af_caf_compression_types,
    240 -		0,		// maximum marker count
    241 -		0,		// maximum instrument count
    242 -		0,		// maximum number of loops per instrument
    243 -		0,		// number of instrument parameters
    244 -		NULL	// instrument parameters
    245 -	},
    246 -	{
    247 -		AF_FILE_FLAC,
    248 -		"FLAC", "Free Lossless Audio Codec", "flac",
    249 -		true,
    250 -		FLACFile::completeSetup,
    251 -		FLACFile::recognize,
    252 -		AF_SAMPFMT_TWOSCOMP, 16,
    253 -		_AF_FLAC_NUM_COMPTYPES,
    254 -		_af_flac_compression_types,
    255 -		0,		// maximum marker count
    256 -		0,		// maximum instrument count
    257 -		0,		// maximum number of loops per instrument
    258 -		0,		// number of instrument parameters
    259 -		NULL	// instrument parameters
    260 -	}
    261  };
    262  
    263  const CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
    264 @@ -309,19 +145,6 @@ const CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
    265  		_af_g711_format_ok,
    266  		_AFg711initcompress, _AFg711initdecompress
    267  	},
    268 -	{
    269 -		AF_COMPRESSION_IMA,
    270 -		true,
    271 -		"ima4",	/* label */
    272 -		"IMA ADPCM",	/* short name */
    273 -		"IMA DVI ADPCM",
    274 -		4.0,
    275 -		AF_SAMPFMT_TWOSCOMP, 16,
    276 -		true,	/* needsRebuffer */
    277 -		false,	/* multiple_of */
    278 -		_af_ima_adpcm_format_ok,
    279 -		_af_ima_adpcm_init_compress, _af_ima_adpcm_init_decompress
    280 -	},
    281  	{
    282  		AF_COMPRESSION_MS_ADPCM,
    283  		true,
    284 @@ -335,34 +158,4 @@ const CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
    285  		_af_ms_adpcm_format_ok,
    286  		_af_ms_adpcm_init_compress, _af_ms_adpcm_init_decompress
    287  	},
    288 -	{
    289 -		AF_COMPRESSION_FLAC,
    290 -#if ENABLE(FLAC)
    291 -		true,
    292 -#else
    293 -		false,
    294 -#endif
    295 -		"flac",	// label
    296 -		"FLAC",	// short name
    297 -		"Free Lossless Audio Codec",
    298 -		1.0,
    299 -		AF_SAMPFMT_TWOSCOMP, 16,
    300 -		false,	// needsRebuffer
    301 -		false,	// multiple_of
    302 -		_af_flac_format_ok,
    303 -		_af_flac_init_compress, _af_flac_init_decompress
    304 -	},
    305 -	{
    306 -		AF_COMPRESSION_ALAC,
    307 -		true,
    308 -		"alac",	// label
    309 -		"ALAC",	// short name
    310 -		"Apple Lossless Audio Codec",
    311 -		1.0,
    312 -		AF_SAMPFMT_TWOSCOMP, 16,
    313 -		true,	// needsRebuffer
    314 -		false,	// multiple_of
    315 -		_af_alac_format_ok,
    316 -		_af_alac_init_compress, _af_alac_init_decompress
    317 -	}
    318  };