]> git.pld-linux.org Git - packages/audiofile.git/blame - audiofile-less_mem_hungry.patch
projects / packages / audiofile.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 5
[packages/audiofile.git] / audiofile-less_mem_hungry.patch
CommitLineData
ad5da9eb 1diff -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
4@@ -64,7 +64,7 @@
5 static status ParseSSND (AFfilehandle file, AFvirtualfile *fh, u_int32_t type,
6 size_t size);
7
8-_InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] =
9+const _InstParamInfo _af_aiff_inst_params[_AF_AIFF_NUM_INSTPARAMS] =
10 {
11 { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} },
12 { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} },
13@@ -77,7 +77,7 @@
14 { AF_INST_RELLOOPID, AU_PVTYPE_LONG, "Release loop id", {0} }
15 };
16
17-int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] =
18+const int _af_aiffc_compression_types[_AF_AIFF_NUM_COMPTYPES] =
19 {
20 AF_COMPRESSION_G711_ULAW,
21 AF_COMPRESSION_G711_ALAW
22diff -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
25@@ -37,7 +37,7 @@
26 #include "units.h"
27 #include "util.h"
28
29-extern _CompressionUnit _af_compression[];
30+extern const _CompressionUnit _af_compression[];
31
32 int _af_compression_index_from_id (int compressionid)
33 {
34@@ -54,7 +54,7 @@
35 return -1;
36 }
37
38-static _CompressionUnit *findCompression (int compressionid)
39+static const _CompressionUnit *findCompression (int compressionid)
40 {
41 int compressionno;
42
43diff -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
46@@ -49,7 +49,7 @@
47 #include "print.h"
48 #include "debug.h"
49
50-extern _CompressionUnit _af_compression[];
51+extern const _CompressionUnit _af_compression[];
52
53 void _af_printid (u_int32_t id)
54 {
55diff -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
58@@ -43,7 +43,7 @@
59 #include "units.h"
60 #include "modules.h"
61
62-extern _Unit _af_units[];
63+extern const _Unit _af_units[];
64
65 AFfileoffset afGetDataOffset (AFfilehandle file, int trackid)
66 {
67diff -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
70@@ -38,7 +38,7 @@
71 #define SEG_MASK (0x70) /* Segment field mask. */
72
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,
79@@ -56,7 +56,7 @@
80 113, 114, 115, 116, 117, 118, 119, 120,
81 121, 122, 123, 124, 125, 126, 127, 128};
82
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,
88@@ -77,7 +77,7 @@
89 /* see libst.h */
90 #ifdef SUPERCEDED
91
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};
95
96 static int
97diff -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
100@@ -55,7 +55,7 @@
101
102 #include <stdio.h>
103
104-extern _Unit _af_units[];
105+extern const _Unit _af_units[];
106
107 /*
108 Initialize instrument id list for audio file.
109diff -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
112@@ -56,15 +56,15 @@
113
114 #define NULLMODULEPARAM
115
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;
124
125 extern _CompressionUnit _af_compression[];
126
127 /* Define rebuffering modules. */
128-extern _AFmodule int2rebufferv2f, int2rebufferf2v;
129+extern const _AFmodule int2rebufferv2f, int2rebufferf2v;
130
131 /*
132 module utility routines
133@@ -1511,7 +1511,7 @@
134 }
135 };
136
137-static _PCMInfo *intmappings[6] =
138+static const _PCMInfo *intmappings[6] =
139 {
140 &_af_default_signed_integer_pcm_mappings[1],
141 &_af_default_signed_integer_pcm_mappings[2],
142diff -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
145@@ -47,7 +47,7 @@
146 #include "setup.h"
147 #include "byteorder.h"
148
149-int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] =
150+const int _af_next_compression_types[_AF_NEXT_NUM_COMPTYPES] =
151 {
152 AF_COMPRESSION_G711_ULAW,
153 AF_COMPRESSION_G711_ALAW
154diff -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
157@@ -45,7 +45,7 @@
158 #define SETBINARYMODE(x)
159 #endif /* WIN32 || __CYGWIN__ */
160
161-extern _Unit _af_units[];
162+extern const _Unit _af_units[];
163
164 static void freeFileHandle (AFfilehandle filehandle);
165 static void freeInstParams (AFPVu *values, int fileFormat);
166diff -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
169@@ -33,7 +33,7 @@
170 #include "pcm.h"
171 #include "util.h"
172
173-_PCMInfo _af_default_signed_integer_pcm_mappings[] =
174+const _PCMInfo _af_default_signed_integer_pcm_mappings[] =
175 {
176 {0, 0, 0, 0},
177 {SLOPE_INT8, 0, MIN_INT8, MAX_INT8},
178@@ -42,7 +42,7 @@
179 {SLOPE_INT32, 0, MIN_INT32, MAX_INT32}
180 };
181
182-_PCMInfo _af_default_unsigned_integer_pcm_mappings[] =
183+const _PCMInfo _af_default_unsigned_integer_pcm_mappings[] =
184 {
185 {0, 0, 0, 0},
186 {SLOPE_INT8, INTERCEPT_U_INT8, 0, MAX_U_INT8},
187@@ -51,10 +51,10 @@
188 {SLOPE_INT32, INTERCEPT_U_INT32, 0, MAX_U_INT32}
189 };
190
191-_PCMInfo _af_default_float_pcm_mapping =
192+const _PCMInfo _af_default_float_pcm_mapping =
193 {1, 0, 0, 0};
194
195-_PCMInfo _af_default_double_pcm_mapping =
196+const _PCMInfo _af_default_double_pcm_mapping =
197 {1, 0, 0, 0};
198
199 /*
200diff -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
203@@ -43,8 +43,8 @@
204 #include "compression.h"
205 #include "instrument.h"
206
207-extern _Unit _af_units[];
208-extern _CompressionUnit _af_compression[];
209+extern const _Unit _af_units[];
210+extern const _CompressionUnit _af_compression[];
211
212 AUpvlist _afQueryFileFormat (int arg1, int arg2, int arg3, int arg4);
213 AUpvlist _afQueryInstrument (int arg1, int arg2, int arg3, int arg4);
214diff -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
217@@ -50,7 +50,7 @@
218 NULL /* miscellaneous */
219 };
220
221-int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] =
222+const int _af_raw_compression_types[_AF_RAW_NUM_COMPTYPES] =
223 {
224 AF_COMPRESSION_G711_ULAW,
225 AF_COMPRESSION_G711_ALAW
226diff -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
229@@ -39,7 +39,7 @@
230
231 extern _Unit _af_units[];
232
233-_AFfilesetup _af_default_file_setup =
234+const _AFfilesetup _af_default_file_setup =
235 {
236 _AF_VALID_FILESETUP, /* valid */
237 #if WORDS_BIGENDIAN
238@@ -58,7 +58,7 @@
239 NULL /* miscellaneous */
240 };
241
242-_InstrumentSetup _af_default_instrumentsetup =
243+const _InstrumentSetup _af_default_instrumentsetup =
244 {
245 0, /* id */
246 2, /* loopCount */
247@@ -66,7 +66,7 @@
248 AF_FALSE /* loopSet */
249 };
250
251-_TrackSetup _af_default_tracksetup =
252+const _TrackSetup _af_default_tracksetup =
253 {
254 0,
255 {
256diff -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
259@@ -56,7 +56,7 @@
260 extern int _af_next_compression_types[];
261 extern int _af_wave_compression_types[];
262
263-_Unit _af_units[_AF_NUM_UNITS] =
264+const _Unit _af_units[_AF_NUM_UNITS] =
265 {
266 {
267 AF_FILE_RAWDATA,
268@@ -221,7 +221,7 @@
269 }
270 };
271
272-_CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
273+const _CompressionUnit _af_compression[_AF_NUM_COMPRESSION] =
274 {
275 {
276 AF_COMPRESSION_NONE,
277diff -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
280@@ -46,12 +46,12 @@
281 #include "byteorder.h"
282 #include "aupvinternal.h"
283
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;
292
293-extern _CompressionUnit _af_compression[];
294+extern const _CompressionUnit _af_compression[];
295
296 /*
297 _af_filesetup_ok and _af_filehandle_ok are sanity check routines
298diff -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
301@@ -49,13 +49,13 @@
302 #include "setup.h"
303 #include "marker.h"
304
305-int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] =
306+const int _af_wave_compression_types[_AF_WAVE_NUM_COMPTYPES] =
307 {
308 AF_COMPRESSION_G711_ULAW,
309 AF_COMPRESSION_G711_ALAW
310 };
311
312-_InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] =
313+const _InstParamInfo _af_wave_inst_params[_AF_WAVE_NUM_INSTPARAMS] =
314 {
315 { AF_INST_MIDI_BASENOTE, AU_PVTYPE_LONG, "MIDI base note", {60} },
316 { AF_INST_NUMCENTS_DETUNE, AU_PVTYPE_LONG, "Detune in cents", {0} },
Audio File Library - SGI Audio File Library
This page took 0.070553 seconds and 4 git commands to generate.