1 diff -ur audiofile-0.2.6-orig/libaudiofile/aiff.c audiofile-0.2.6-mine/libaudiofile/aiff.c
2 --- audiofile-0.2.6-orig/libaudiofile/aiff.c 2004-03-06 01:39:23.000000000 -0500
3 +++ audiofile-0.2.6-mine/libaudiofile/aiff.c 2006-03-22 02:15:50.058306000 -0500
5 static status ParseSSND (AFfilehandle file, AFvirtualfile *fh, u_int32_t type,
8 -_InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] =
9 +const _InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] =
11 { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} },
12 { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} },
14 { AF_INST_RELLOOPID, AU_PVTYPE_LONG, "Release loop id", {0} }
17 -int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] =
18 +const int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] =
20 AF_COMPRESSION_G711_ULAW,
21 AF_COMPRESSION_G711_ALAW
22 diff -ur audiofile-0.2.6-orig/libaudiofile/compression.c audiofile-0.2.6-mine/libaudiofile/compression.c
23 --- audiofile-0.2.6-orig/libaudiofile/compression.c 2004-03-06 01:39:23.000000000 -0500
24 +++ audiofile-0.2.6-mine/libaudiofile/compression.c 2006-03-22 02:04:44.948739250 -0500
29 -extern _CompressionUnit _af_compression[];
30 +extern const _CompressionUnit _af_compression[];
32 int _af_compression_index_from_id (int compressionid)
38 -static _CompressionUnit *findCompression (int compressionid)
39 +static const _CompressionUnit *findCompression (int compressionid)
43 diff -ur audiofile-0.2.6-orig/libaudiofile/debug.c audiofile-0.2.6-mine/libaudiofile/debug.c
44 --- audiofile-0.2.6-orig/libaudiofile/debug.c 2004-03-06 01:39:23.000000000 -0500
45 +++ audiofile-0.2.6-mine/libaudiofile/debug.c 2006-03-22 01:56:31.187180000 -0500
50 -extern _CompressionUnit _af_compression[];
51 +extern const _CompressionUnit _af_compression[];
53 void _af_printid (u_int32_t id)
55 diff -ur audiofile-0.2.6-orig/libaudiofile/format.c audiofile-0.2.6-mine/libaudiofile/format.c
56 --- audiofile-0.2.6-orig/libaudiofile/format.c 2004-03-06 01:39:23.000000000 -0500
57 +++ audiofile-0.2.6-mine/libaudiofile/format.c 2006-03-22 01:56:21.586580000 -0500
62 -extern _Unit _af_units[];
63 +extern const _Unit _af_units[];
65 AFfileoffset afGetDataOffset (AFfilehandle file, int trackid)
67 diff -ur audiofile-0.2.6-orig/libaudiofile/g711.c audiofile-0.2.6-mine/libaudiofile/g711.c
68 --- audiofile-0.2.6-orig/libaudiofile/g711.c 2004-03-06 01:39:23.000000000 -0500
69 +++ audiofile-0.2.6-mine/libaudiofile/g711.c 2006-03-21 22:57:37.356130750 -0500
71 #define SEG_MASK (0x70) /* Segment field mask. */
73 /* copy from CCITT G.711 specifications */
74 -static unsigned char _u2a[128] = { /* u- to A-law conversions */
75 +static const unsigned char _u2a[128] = { /* u- to A-law conversions */
76 1, 1, 2, 2, 3, 3, 4, 4,
77 5, 5, 6, 6, 7, 7, 8, 8,
78 9, 10, 11, 12, 13, 14, 15, 16,
80 113, 114, 115, 116, 117, 118, 119, 120,
81 121, 122, 123, 124, 125, 126, 127, 128};
83 -static unsigned char _a2u[128] = { /* A- to u-law conversions */
84 +static const unsigned char _a2u[128] = { /* A- to u-law conversions */
85 1, 3, 5, 7, 9, 11, 13, 15,
86 16, 17, 18, 19, 20, 21, 22, 23,
87 24, 25, 26, 27, 28, 29, 30, 31,
92 -static short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
93 +static const short seg_end[8] = {0xFF, 0x1FF, 0x3FF, 0x7FF,
94 0xFFF, 0x1FFF, 0x3FFF, 0x7FFF};
97 diff -ur audiofile-0.2.6-orig/libaudiofile/instrument.c audiofile-0.2.6-mine/libaudiofile/instrument.c
98 --- audiofile-0.2.6-orig/libaudiofile/instrument.c 2004-03-06 01:39:23.000000000 -0500
99 +++ audiofile-0.2.6-mine/libaudiofile/instrument.c 2006-03-22 01:56:12.642021000 -0500
104 -extern _Unit _af_units[];
105 +extern const _Unit _af_units[];
108 Initialize instrument id list for audio file.
109 diff -ur audiofile-0.2.6-orig/libaudiofile/modules.c audiofile-0.2.6-mine/libaudiofile/modules.c
110 --- audiofile-0.2.6-orig/libaudiofile/modules.c 2004-03-06 01:39:23.000000000 -0500
111 +++ audiofile-0.2.6-mine/libaudiofile/modules.c 2006-03-22 02:07:29.411017500 -0500
114 #define NULLMODULEPARAM
116 -extern _PCMInfo _af_default_signed_integer_pcm_mappings[];
117 -extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
118 -extern _PCMInfo _af_default_float_pcm_mapping;
119 -extern _PCMInfo _af_default_double_pcm_mapping;
120 +extern const _PCMInfo _af_default_signed_integer_pcm_mappings[];
121 +extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
122 +extern const _PCMInfo _af_default_float_pcm_mapping;
123 +extern const _PCMInfo _af_default_double_pcm_mapping;
125 extern _CompressionUnit _af_compression[];
127 /* Define rebuffering modules. */
128 -extern _AFmodule int2rebufferv2f, int2rebufferf2v;
129 +extern const _AFmodule int2rebufferv2f, int2rebufferf2v;
132 module utility routines
133 @@ -1511,7 +1511,7 @@
137 -static _PCMInfo *intmappings[6] =
138 +static const _PCMInfo *intmappings[6] =
140 &_af_default_signed_integer_pcm_mappings[1],
141 &_af_default_signed_integer_pcm_mappings[2],
142 diff -ur audiofile-0.2.6-orig/libaudiofile/next.c audiofile-0.2.6-mine/libaudiofile/next.c
143 --- audiofile-0.2.6-orig/libaudiofile/next.c 2004-03-06 01:39:23.000000000 -0500
144 +++ audiofile-0.2.6-mine/libaudiofile/next.c 2006-03-22 02:15:59.742911250 -0500
147 #include "byteorder.h"
149 -int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] =
150 +const int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] =
152 AF_COMPRESSION_G711_ULAW,
153 AF_COMPRESSION_G711_ALAW
154 diff -ur audiofile-0.2.6-orig/libaudiofile/openclose.c audiofile-0.2.6-mine/libaudiofile/openclose.c
155 --- audiofile-0.2.6-orig/libaudiofile/openclose.c 2004-03-06 01:39:23.000000000 -0500
156 +++ audiofile-0.2.6-mine/libaudiofile/openclose.c 2006-03-22 01:55:33.067547750 -0500
158 #define SETBINARYMODE(x)
159 #endif /* WIN32 || __CYGWIN__ */
161 -extern _Unit _af_units[];
162 +extern const _Unit _af_units[];
164 static void freeFileHandle (AFfilehandle filehandle);
165 static void freeInstParams (AFPVu *values, int fileFormat);
166 diff -ur audiofile-0.2.6-orig/libaudiofile/pcm.c audiofile-0.2.6-mine/libaudiofile/pcm.c
167 --- audiofile-0.2.6-orig/libaudiofile/pcm.c 2004-03-06 01:39:23.000000000 -0500
168 +++ audiofile-0.2.6-mine/libaudiofile/pcm.c 2006-03-21 22:56:53.581395000 -0500
173 -_PCMInfo _af_default_signed_integer_pcm_mappings[] =
174 +const _PCMInfo _af_default_signed_integer_pcm_mappings[] =
177 {SLOPE_INT8, 0, MIN_INT8, MAX_INT8},
179 {SLOPE_INT32, 0, MIN_INT32, MAX_INT32}
182 -_PCMInfo _af_default_unsigned_integer_pcm_mappings[] =
183 +const _PCMInfo _af_default_unsigned_integer_pcm_mappings[] =
186 {SLOPE_INT8, INTERCEPT_U_INT8, 0, MAX_U_INT8},
188 {SLOPE_INT32, INTERCEPT_U_INT32, 0, MAX_U_INT32}
191 -_PCMInfo _af_default_float_pcm_mapping =
192 +const _PCMInfo _af_default_float_pcm_mapping =
195 -_PCMInfo _af_default_double_pcm_mapping =
196 +const _PCMInfo _af_default_double_pcm_mapping =
200 diff -ur audiofile-0.2.6-orig/libaudiofile/query.c audiofile-0.2.6-mine/libaudiofile/query.c
201 --- audiofile-0.2.6-orig/libaudiofile/query.c 2004-03-06 01:39:23.000000000 -0500
202 +++ audiofile-0.2.6-mine/libaudiofile/query.c 2006-03-22 01:55:23.070923000 -0500
204 #include "compression.h"
205 #include "instrument.h"
207 -extern _Unit _af_units[];
208 -extern _CompressionUnit _af_compression[];
209 +extern const _Unit _af_units[];
210 +extern const _CompressionUnit _af_compression[];
212 AUpvlist _afQueryFileFormat (int arg1, int arg2, int arg3, int arg4);
213 AUpvlist _afQueryInstrument (int arg1, int arg2, int arg3, int arg4);
214 diff -ur audiofile-0.2.6-orig/libaudiofile/raw.c audiofile-0.2.6-mine/libaudiofile/raw.c
215 --- audiofile-0.2.6-orig/libaudiofile/raw.c 2004-03-06 01:39:23.000000000 -0500
216 +++ audiofile-0.2.6-mine/libaudiofile/raw.c 2006-03-22 02:16:08.563462500 -0500
218 NULL /* miscellaneous */
221 -int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] =
222 +const int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] =
224 AF_COMPRESSION_G711_ULAW,
225 AF_COMPRESSION_G711_ALAW
226 diff -ur audiofile-0.2.6-orig/libaudiofile/setup.c audiofile-0.2.6-mine/libaudiofile/setup.c
227 --- audiofile-0.2.6-orig/libaudiofile/setup.c 2004-03-06 01:39:23.000000000 -0500
228 +++ audiofile-0.2.6-mine/libaudiofile/setup.c 2006-03-22 02:16:14.567837750 -0500
231 extern _Unit _af_units[];
233 -_AFfilesetup _af_default_file_setup =
234 +const _AFfilesetup _af_default_file_setup =
236 _AF_VALID_FILESETUP, /* valid */
239 NULL /* miscellaneous */
242 -_InstrumentSetup _af_default_instrumentsetup =
243 +const _InstrumentSetup _af_default_instrumentsetup =
248 AF_FALSE /* loopSet */
251 -_TrackSetup _af_default_tracksetup =
252 +const _TrackSetup _af_default_tracksetup =
256 diff -ur audiofile-0.2.6-orig/libaudiofile/units.c audiofile-0.2.6-mine/libaudiofile/units.c
257 --- audiofile-0.2.6-orig/libaudiofile/units.c 2004-03-06 01:39:23.000000000 -0500
258 +++ audiofile-0.2.6-mine/libaudiofile/units.c 2006-03-22 02:02:12.335201500 -0500
260 extern int _af_next_compression_types[];
261 extern int _af_wave_compression_types[];
263 -_Unit _af_units[_AF_NUM_UNITS] =
264 +const _Unit _af_units[_AF_NUM_UNITS] =
272 -_CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
273 +const _CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
277 diff -ur audiofile-0.2.6-orig/libaudiofile/util.c audiofile-0.2.6-mine/libaudiofile/util.c
278 --- audiofile-0.2.6-orig/libaudiofile/util.c 2004-03-06 01:39:23.000000000 -0500
279 +++ audiofile-0.2.6-mine/libaudiofile/util.c 2006-03-22 01:54:41.944352750 -0500
281 #include "byteorder.h"
282 #include "aupvinternal.h"
284 -extern _PCMInfo _af_default_signed_integer_pcm_mappings[];
285 -extern _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
286 -extern _PCMInfo _af_default_float_pcm_mapping;
287 -extern _PCMInfo _af_default_double_pcm_mapping;
288 +extern const _PCMInfo _af_default_signed_integer_pcm_mappings[];
289 +extern const _PCMInfo _af_default_unsigned_integer_pcm_mappings[];
290 +extern const _PCMInfo _af_default_float_pcm_mapping;
291 +extern const _PCMInfo _af_default_double_pcm_mapping;
293 -extern _CompressionUnit _af_compression[];
294 +extern const _CompressionUnit _af_compression[];
297 _af_filesetup_ok and _af_filehandle_ok are sanity check routines
298 diff -ur audiofile-0.2.6-orig/libaudiofile/wave.c audiofile-0.2.6-mine/libaudiofile/wave.c
299 --- audiofile-0.2.6-orig/libaudiofile/wave.c 2004-03-06 01:39:23.000000000 -0500
300 +++ audiofile-0.2.6-mine/libaudiofile/wave.c 2006-03-22 02:16:29.568775250 -0500
305 -int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] =
306 +const int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] =
308 AF_COMPRESSION_G711_ULAW,
309 AF_COMPRESSION_G711_ALAW
312 -_InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] =
313 +const _InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] =
315 { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} },
316 { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} },