Mercurial > hg > dmlib
annotate tools/xm2jss.c @ 1233:d4b373d53a64
Add some sanity checks.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 06 Mar 2015 13:14:02 +0200 |
parents | 10cb3c400451 |
children | 5b8245e5f785 |
rev | line source |
---|---|
0 | 1 /* |
2 * xm2jss - Convert XM module to JSSMOD | |
3 * Programmed and designed by Matti 'ccr' Hamalainen | |
4 * (C) Copyright 2006-2009 Tecnic Software productions (TNSP) | |
5 * | |
6 * Please read file 'COPYING' for information on license and distribution. | |
7 */ | |
8 #include <stdio.h> | |
9 #include <errno.h> | |
10 #include "jss.h" | |
11 #include "jssmod.h" | |
184
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
12 #include "jssplr.h" |
0 | 13 #include "dmlib.h" |
14 #include "dmargs.h" | |
15 #include "dmres.h" | |
285
245b15cd1919
Don't link libSDL uselessly to utilities that do not actually use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
202
diff
changeset
|
16 #include "dmmutex.h" |
245b15cd1919
Don't link libSDL uselessly to utilities that do not actually use it.
Matti Hamalainen <ccr@tnsp.org>
parents:
202
diff
changeset
|
17 |
0 | 18 |
184
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
19 #define jmpNMODEffectTable (36) |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
20 static const char jmpMODEffectTable[jmpNMODEffectTable] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; |
1099 | 21 #define JM_SAMPLE_MODE_MASK (jsampFlipSign | jsampSwapEndianess | jsampSplit | jsampDelta) |
184
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
22 |
0 | 23 |
300 | 24 char *optInFilename = NULL, *optOutFilename = NULL; |
0 | 25 BOOL optIgnoreErrors = FALSE, |
26 optStripExtInstr = FALSE, | |
27 optStripInstr = FALSE, | |
28 optStripSamples = FALSE, | |
29 optOptimize = FALSE; | |
30 | |
31 int optPatternMode = PATMODE_COMP_HORIZ, | |
32 optSampMode16 = jsampDelta, | |
33 optSampMode8 = jsampFlipSign | jsampDelta; | |
34 | |
35 | |
36 static const char* patModeTable[PATMODE_LAST] = | |
37 { | |
38 "Raw horizontal", | |
39 "Compressed horizontal (similar to XM modules)", | |
40 "Raw vertical", | |
41 "Compressed vertical", | |
42 "Raw vertical for each element", | |
43 }; | |
44 | |
45 | |
860
daebbf28953d
The argument handling API in dmargs* was synced with th-libs.
Matti Hamalainen <ccr@tnsp.org>
parents:
856
diff
changeset
|
46 static const DMOptArg optList[] = |
daebbf28953d
The argument handling API in dmargs* was synced with th-libs.
Matti Hamalainen <ccr@tnsp.org>
parents:
856
diff
changeset
|
47 { |
0 | 48 { 0, '?', "help", "Show this help", OPT_NONE }, |
337 | 49 { 1, 'v', "verbose", "Be more verbose", OPT_NONE }, |
50 { 2, 'i', "ignore", "Ignore errors", OPT_NONE }, | |
51 { 3, 'p', "patterns", "Pattern storage mode", OPT_ARGREQ }, | |
52 { 4, 'E', "strip-ext-instr","Strip ext. instruments (implies -I -S)", OPT_NONE }, | |
53 { 5, 'I', "strip-instr", "Strip instruments (implies -S)", OPT_NONE }, | |
54 { 6, 'S', "strip-samples", "Strip instr. sampledata", OPT_NONE }, | |
0 | 55 { 7, '8', "smode8", "8-bit sample conversion flags", OPT_ARGREQ }, |
56 { 8, '1', "smode16", "16-bit sample conversion flags", OPT_ARGREQ }, | |
337 | 57 { 9, 'O', "optimize", "Optimize module", OPT_NONE }, |
0 | 58 }; |
59 | |
60 const int optListN = sizeof(optList) / sizeof(optList[0]); | |
61 | |
62 | |
63 void argShowHelp() | |
64 { | |
65 int i; | |
66 | |
337 | 67 dmPrintBanner(stdout, dmProgName, "[options] <input.xm> <output.jmod>"); |
860
daebbf28953d
The argument handling API in dmargs* was synced with th-libs.
Matti Hamalainen <ccr@tnsp.org>
parents:
856
diff
changeset
|
68 dmArgsPrintHelp(stdout, optList, optListN, 0); |
0 | 69 |
70 printf("\n" | |
71 "Pattern storage modes:\n"); | |
72 | |
73 for (i = 1; i < PATMODE_LAST; i++) | |
74 printf(" %d = %s\n", i, patModeTable[i-1]); | |
75 | |
76 printf( | |
77 "\n" | |
78 "Sample data conversion flags (summative):\n" | |
79 " 1 = Delta encoding (DEF 8 & 16)\n" | |
80 " 2 = Flip signedness (DEF 8)\n" | |
81 " 4 = Swap endianess (affects 16-bit only)\n" | |
82 " 8 = Split and de-interleave hi/lo bytes (affects 16-bit only)\n" | |
83 "\n" | |
84 ); | |
85 } | |
86 | |
87 BOOL argHandleOpt(const int optN, char *optArg, char *currArg) | |
88 { | |
89 (void) optArg; | |
90 | |
91 switch (optN) | |
92 { | |
93 case 0: | |
94 argShowHelp(); | |
95 exit(0); | |
96 break; | |
97 | |
98 case 1: | |
337 | 99 dmVerbosity++; |
100 break; | |
101 | |
102 case 2: | |
0 | 103 optIgnoreErrors = TRUE; |
104 break; | |
105 | |
337 | 106 case 3: |
0 | 107 optPatternMode = atoi(optArg); |
108 if (optPatternMode <= 0 || optPatternMode >= PATMODE_LAST) | |
109 { | |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
110 dmErrorMsg("Unknown pattern conversion mode %d\n", optPatternMode); |
0 | 111 return FALSE; |
112 } | |
113 break; | |
114 | |
337 | 115 case 4: optStripExtInstr = TRUE; break; |
116 case 5: optStripInstr = TRUE; break; | |
117 case 6: optStripSamples = TRUE; break; | |
118 | |
1099 | 119 case 7: optSampMode8 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break; |
120 case 8: optSampMode16 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break; | |
0 | 121 |
337 | 122 case 9: optOptimize = TRUE; break; |
0 | 123 |
124 default: | |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
125 dmErrorMsg("Unknown argument '%s'.\n", currArg); |
0 | 126 return FALSE; |
127 } | |
128 | |
129 return TRUE; | |
130 } | |
131 | |
132 | |
133 BOOL argHandleFile(char *currArg) | |
134 { | |
135 // Was not option argument | |
300 | 136 if (!optInFilename) |
137 optInFilename = currArg; | |
337 | 138 else |
300 | 139 if (!optOutFilename) |
140 optOutFilename = currArg; | |
0 | 141 else |
142 { | |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
143 dmErrorMsg("Too many filename arguments specified, '%s'.\n", currArg); |
0 | 144 return FALSE; |
145 } | |
146 | |
147 return TRUE; | |
148 } | |
149 | |
150 | |
151 /* These functions and the macro mess are meant to make the | |
152 * conversion routines themselves clearer and simpler. | |
153 */ | |
154 BOOL jsPutByte(Uint8 *patBuf, size_t patBufSize, size_t *npatBuf, Uint8 val) | |
155 { | |
156 if (*npatBuf >= patBufSize) | |
157 return FALSE; | |
158 else | |
159 { | |
160 patBuf[*npatBuf] = val; | |
161 (*npatBuf)++; | |
162 return TRUE; | |
163 } | |
164 } | |
165 | |
166 #define JSPUTBYTE(x) do { if (!jsPutByte(patBuf, patBufSize, patSize, x)) return DMERR_BOUNDS; } while (0) | |
167 | |
168 #define JSCOMP(x,z) do { if ((x) != jsetNotSet) { qflags |= (z); qcomp++; } } while (0) | |
169 | |
170 #define JSCOMPPUT(xf,xv,qv) do { \ | |
171 if (qflags & (xf)) { \ | |
172 if ((xv) < 0 || (xv) > 255) \ | |
173 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, \ | |
174 "%s value out of bounds %d.\n", qv, (xv)); \ | |
175 JSPUTBYTE(xv); \ | |
176 } \ | |
177 } while (0) | |
178 | |
179 #define JSCONVPUT(xv,qv) do { \ | |
180 if ((xv) != jsetNotSet) { \ | |
181 if ((xv) < 0 || (xv) > 254) \ | |
182 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, \ | |
183 "%s value out of bounds %d.\n", qv, (xv)); \ | |
184 JSPUTBYTE((xv) + 1); \ | |
185 } else { \ | |
186 JSPUTBYTE(0); \ | |
187 } \ | |
188 } while (0) | |
189 | |
190 | |
191 /* Convert a note | |
192 */ | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
193 static int jssConvertNote( |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
194 Uint8 *patBuf, const size_t patBufSize, |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
195 size_t *patSize, const JSSNote *pnote) |
0 | 196 { |
197 Uint8 tmp; | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
198 if (pnote->note == jsetNotSet) |
0 | 199 tmp = 0; |
1194 | 200 else |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
201 if (pnote->note == jsetNoteOff) |
0 | 202 tmp = 127; |
203 else | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
204 tmp = pnote->note + 1; |
0 | 205 |
206 if (tmp > 0x7f) | |
207 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp); | |
208 | |
209 JSPUTBYTE(tmp & 0x7f); | |
210 | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
211 JSCONVPUT(pnote->instrument, "Instrument"); |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
212 JSCONVPUT(pnote->volume, "Volume"); |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
213 JSCONVPUT(pnote->effect, "Effect"); |
0 | 214 |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
215 tmp = (pnote->param != jsetNotSet) ? pnote->param : 0; |
0 | 216 JSPUTBYTE(tmp); |
217 | |
218 return DMERR_OK; | |
219 } | |
220 | |
221 | |
222 /* Compress a note | |
223 */ | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
224 static int jssCompressNote( |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
225 Uint8 *patBuf, const size_t patBufSize, |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
226 size_t *patSize, const JSSNote *pnote) |
0 | 227 { |
228 Uint8 qflags = 0; | |
229 int qcomp = 0; | |
1201 | 230 |
231 // Determine what would get stored, | |
232 // aka actually how much space we use | |
1210
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
233 JSCOMP(pnote->note, JM_COMP_NOTE); |
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
234 JSCOMP(pnote->instrument, JM_COMP_INSTRUMENT); |
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
235 JSCOMP(pnote->volume, JM_COMP_VOLUME); |
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
236 JSCOMP(pnote->effect, JM_COMP_EFFECT); |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
237 if (pnote->param != jsetNotSet && pnote->param != 0) |
0 | 238 { |
1210
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
239 qflags |= JM_COMP_PARAM; |
0 | 240 qcomp++; |
241 } | |
242 | |
243 if (qcomp < 4) | |
244 { | |
1201 | 245 // Okay, it's less than 4 bytes, so use compressed |
0 | 246 JSPUTBYTE(qflags | 0x80); |
247 | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
248 if (pnote->note != jsetNotSet) |
0 | 249 { |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
250 Uint8 tmp = (pnote->note != jsetNoteOff) ? pnote->note : 127; |
0 | 251 if (tmp > 0x7f) |
252 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp); | |
253 JSPUTBYTE(tmp); | |
254 } | |
255 | |
1210
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
256 JSCOMPPUT(JM_COMP_INSTRUMENT, pnote->instrument, "Instrument"); |
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
257 JSCOMPPUT(JM_COMP_VOLUME, pnote->volume, "Volume"); |
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
258 JSCOMPPUT(JM_COMP_EFFECT, pnote->effect, "Effect"); |
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
259 JSCOMPPUT(JM_COMP_PARAM, pnote->param, "Param"); |
1201 | 260 } |
261 else | |
262 { | |
263 // Was 4 bytes or more, just dump it all in .. | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
264 return jssConvertNote(patBuf, patBufSize, patSize, pnote); |
1201 | 265 } |
266 | |
0 | 267 return DMERR_OK; |
268 } | |
269 | |
270 | |
271 /* Compress pattern | |
272 */ | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
273 static int jssConvertPatternCompHoriz( |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
274 Uint8 *patBuf, const size_t patBufSize, |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
275 size_t *patSize, const JSSPattern *pattern) |
0 | 276 { |
277 int row, channel; | |
278 *patSize = 0; | |
279 | |
280 for (row = 0; row < pattern->nrows; row++) | |
281 for (channel = 0; channel < pattern->nchannels; channel++) | |
282 { | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
283 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
284 const int res = jssCompressNote(patBuf, patBufSize, patSize, pnote); |
0 | 285 if (res != DMERR_OK) |
286 { | |
287 JSSERROR(res, res, "Note compression failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
288 patBuf, patBufSize, *patSize, row, channel); | |
289 return res; | |
290 } | |
291 } | |
292 | |
293 return DMERR_OK; | |
294 } | |
295 | |
296 | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
297 static int jssConvertPatternCompVert( |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
298 Uint8 *patBuf, const size_t patBufSize, |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
299 size_t *patSize, const JSSPattern *pattern) |
0 | 300 { |
301 int row, channel; | |
302 *patSize = 0; | |
303 | |
304 for (channel = 0; channel < pattern->nchannels; channel++) | |
305 for (row = 0; row < pattern->nrows; row++) | |
306 { | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
307 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
308 const int res = jssCompressNote(patBuf, patBufSize, patSize, pnote); |
0 | 309 if (res != DMERR_OK) |
310 { | |
311 JSSERROR(res, res, "Note compression failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
312 patBuf, patBufSize, *patSize, row, channel); | |
313 return res; | |
314 } | |
315 } | |
316 | |
317 return DMERR_OK; | |
318 } | |
319 | |
320 | |
321 /* Convert a pattern | |
322 */ | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
323 static int jssConvertPatternRawHoriz( |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
324 Uint8 *patBuf, const size_t patBufSize, |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
325 size_t *patSize, const JSSPattern *pattern) |
0 | 326 { |
327 int row, channel; | |
328 *patSize = 0; | |
329 | |
330 for (row = 0; row < pattern->nrows; row++) | |
331 for (channel = 0; channel < pattern->nchannels; channel++) | |
332 { | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
333 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
334 const int res = jssConvertNote(patBuf, patBufSize, patSize, pnote); |
0 | 335 if (res != DMERR_OK) |
336 { | |
337 JSSERROR(res, res, "Note conversion failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
338 patBuf, patBufSize, *patSize, row, channel); | |
339 return res; | |
340 } | |
341 } | |
342 | |
343 return DMERR_OK; | |
344 } | |
345 | |
346 | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
347 static int jssConvertPatternRawVert( |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
348 Uint8 *patBuf, const size_t patBufSize, |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
349 size_t *patSize, const JSSPattern *pattern) |
0 | 350 { |
351 int row, channel; | |
352 *patSize = 0; | |
353 | |
354 for (channel = 0; channel < pattern->nchannels; channel++) | |
355 for (row = 0; row < pattern->nrows; row++) | |
356 { | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
357 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
358 const int res = jssConvertNote(patBuf, patBufSize, patSize, pnote); |
0 | 359 if (res != DMERR_OK) |
360 { | |
361 JSSERROR(res, res, "Note conversion failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
362 patBuf, patBufSize, *patSize, row, channel); | |
363 return res; | |
364 } | |
365 } | |
366 | |
367 return DMERR_OK; | |
368 } | |
369 | |
370 | |
371 #define JSFOREACHNOTE1 \ | |
372 for (channel = 0; channel < pattern->nchannels; channel++) \ | |
373 for (row = 0; row < pattern->nrows; row++) { \ | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
374 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
0 | 375 |
376 #define JSFOREACHNOTE2 } | |
377 | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
378 static int jssConvertPatternRawElem( |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
379 Uint8 *patBuf, const size_t patBufSize, |
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
380 size_t *patSize, const JSSPattern *pattern) |
0 | 381 { |
382 Uint8 tmp; | |
383 int row, channel; | |
384 *patSize = 0; | |
385 | |
386 JSFOREACHNOTE1; | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
387 if (pnote->note == jsetNotSet) |
0 | 388 tmp = 0; |
1194 | 389 else |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
390 if (pnote->note == jsetNoteOff) |
0 | 391 tmp = 127; |
392 else | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
393 tmp = pnote->note + 1; |
1194 | 394 |
0 | 395 if (tmp > 0x7f) |
396 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp); | |
1194 | 397 |
0 | 398 JSPUTBYTE(tmp); |
399 JSFOREACHNOTE2; | |
400 | |
401 JSFOREACHNOTE1; | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
402 JSCONVPUT(pnote->instrument, "Instrument"); |
0 | 403 JSFOREACHNOTE2; |
404 | |
405 JSFOREACHNOTE1; | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
406 JSCONVPUT(pnote->volume, "Volume"); |
0 | 407 JSFOREACHNOTE2; |
408 | |
409 JSFOREACHNOTE1; | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
410 JSCONVPUT(pnote->effect, "Effect"); |
0 | 411 JSFOREACHNOTE2; |
412 | |
413 JSFOREACHNOTE1; | |
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
414 tmp = (pnote->param != jsetNotSet) ? pnote->param : 0; |
338
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
415 JSPUTBYTE(tmp); |
0 | 416 JSFOREACHNOTE2; |
417 | |
418 return DMERR_OK; | |
419 } | |
420 | |
421 #undef JSFOREACHNOTE1 | |
422 #undef JSFOREACHNOTE2 | |
423 | |
424 | |
425 static void jssCopyEnvelope(JSSMODEnvelope *je, JSSEnvelope *e) | |
426 { | |
427 int i; | |
428 | |
429 je->flags = e->flags; | |
430 je->npoints = e->npoints; | |
431 je->sustain = e->sustain; | |
432 je->loopS = e->loopS; | |
433 je->loopE = e->loopE; | |
434 | |
435 for (i = 0; i < e->npoints; i++) | |
436 { | |
437 je->points[i].frame = e->points[i].frame; | |
438 je->points[i].value = e->points[i].value; | |
439 } | |
440 } | |
441 | |
442 | |
443 /* Save a JSSMOD file | |
444 */ | |
445 int jssSaveJSSMOD(FILE *outFile, JSSModule *m, int patMode, int flags8, int flags16) | |
446 { | |
447 JSSMODHeader jssH; | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
448 int i, pattern, order, instr, totalSize; |
0 | 449 const size_t patBufSize = 64*1024; // 64kB pattern buffer |
450 Uint8 *patBuf; | |
451 | |
452 // Check the module | |
453 if (m == NULL) | |
454 JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR, "Module pointer was NULL\n"); | |
455 | |
1233 | 456 if (m->nchannels < 1 || m->npatterns < 1 || m->norders < 1 || |
457 m->nchannels > jsetMaxChannels || | |
458 m->npatterns > jsetMaxPatterns || | |
459 m->norders > jsetMaxOrders) | |
0 | 460 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
461 "Module had invalid values (nchannels=%d, npatterns=%d, norders=%d)\n", |
0 | 462 m->nchannels, m->npatterns, m->norders); |
463 | |
464 // Create the JSSMOD header | |
465 jssH.idMagic[0] = 'J'; | |
466 jssH.idMagic[1] = 'M'; | |
467 jssH.idVersion = JSSMOD_VERSION; | |
1231 | 468 jssH.defFlags = m->defFlags; |
469 jssH.intVersion = m->intVersion; | |
0 | 470 jssH.norders = m->norders; |
471 jssH.npatterns = m->npatterns; | |
472 jssH.nextInstruments = m->nextInstruments; | |
473 jssH.ninstruments = m->ninstruments; | |
474 jssH.defRestartPos = m->defRestartPos; | |
1231 | 475 |
476 jssH.nchannels = m->nchannels; | |
0 | 477 jssH.defSpeed = m->defSpeed; |
478 jssH.defTempo = m->defTempo; | |
479 jssH.patMode = patMode; | |
1209 | 480 |
0 | 481 // Write header |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
482 totalSize = sizeof(jssH); |
0 | 483 if (fwrite(&jssH, sizeof(jssH), 1, outFile) != 1) |
484 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, "Could not write JSSMOD header!\n"); | |
485 | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
486 dmMsg(1," * JSSMOD-header 0x%04x, %d bytes.\n", JSSMOD_VERSION, totalSize); |
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
487 |
0 | 488 // Write orders list |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
489 for (totalSize = order = 0; order < m->norders; order++) |
0 | 490 { |
491 Uint16 tmp = m->orderList[order]; | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
492 totalSize += sizeof(tmp); |
0 | 493 if (fwrite(&tmp, sizeof(tmp), 1, outFile) != 1) |
494 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, "Could not write JSSMOD orders list.\n"); | |
495 } | |
496 | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
497 dmMsg(1," * %d item orders list, %d bytes.\n", |
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
498 m->norders, totalSize); |
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
499 |
0 | 500 // Allocate pattern compression buffer |
501 if ((patBuf = dmMalloc(patBufSize)) == NULL) | |
502 JSSERROR(DMERR_MALLOC, DMERR_MALLOC, | |
503 "Error allocating memory for pattern compression buffer.\n"); | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
504 |
1232 | 505 // Convert and write patterns |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
506 for (totalSize = pattern = 0; pattern < m->npatterns; pattern++) |
0 | 507 { |
1232 | 508 JSSPattern *pat = m->patterns[pattern]; |
0 | 509 JSSMODPattern patHead; |
510 size_t finalSize = 0; | |
511 | |
1232 | 512 if (pat == NULL) |
513 JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR, | |
514 "Pattern #%d was NULL.\n", pattern); | |
515 if (pat->nrows > jsetMaxRows) | |
516 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA, | |
517 "Pattern #%d has %d rows > %d max.\n", | |
518 pattern, pat->nrows, jsetMaxRows); | |
0 | 519 switch (patMode) |
520 { | |
521 case PATMODE_RAW_HORIZ: | |
1232 | 522 i = jssConvertPatternRawHoriz(patBuf, patBufSize, &finalSize, pat); |
0 | 523 break; |
524 case PATMODE_COMP_HORIZ: | |
1232 | 525 i = jssConvertPatternCompHoriz(patBuf, patBufSize, &finalSize, pat); |
0 | 526 break; |
527 case PATMODE_RAW_VERT: | |
1232 | 528 i = jssConvertPatternRawVert(patBuf, patBufSize, &finalSize, pat); |
0 | 529 break; |
530 case PATMODE_COMP_VERT: | |
1232 | 531 i = jssConvertPatternCompVert(patBuf, patBufSize, &finalSize, pat); |
0 | 532 break; |
533 case PATMODE_RAW_ELEM: | |
1232 | 534 i = jssConvertPatternRawElem(patBuf, patBufSize, &finalSize, pat); |
0 | 535 break; |
536 default: | |
537 dmFree(patBuf); | |
538 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA, | |
539 "Unsupported pattern conversion mode %d.\n", patMode); | |
540 } | |
541 | |
542 if (i != DMERR_OK) | |
543 { | |
544 dmFree(patBuf); | |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
545 JSSERROR(i, i, "Error converting pattern data #%d\n", pattern); |
0 | 546 } |
1211 | 547 |
548 dmMsg(3, " - Pattern %d size %d bytes\n", pattern, finalSize); | |
1232 | 549 patHead.nrows = pat->nrows; |
1211 | 550 patHead.size = finalSize; |
551 totalSize += finalSize + sizeof(patHead); | |
0 | 552 |
1211 | 553 if (fwrite(&patHead, sizeof(patHead), 1, outFile) != 1) |
554 { | |
555 dmFree(patBuf); | |
556 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, | |
557 "Error writing pattern #%d header\n", pattern); | |
558 } | |
0 | 559 |
1211 | 560 if (fwrite(patBuf, sizeof(Uint8), finalSize, outFile) != finalSize) |
561 { | |
562 dmFree(patBuf); | |
563 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, | |
564 "Error writing pattern #%d data\n", pattern); | |
0 | 565 } |
566 } | |
567 dmFree(patBuf); | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
568 dmMsg(1," * %d patterns, %d bytes.\n", m->npatterns, totalSize); |
0 | 569 |
570 // Write extended instruments | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
571 for (totalSize = instr = 0; instr < m->nextInstruments; instr++) |
0 | 572 { |
573 JSSMODExtInstrument jssE; | |
574 JSSExtInstrument *einst = m->extInstruments[instr]; | |
575 | |
1167 | 576 dmMemset(&jssE, 0, sizeof(jssE)); |
0 | 577 |
578 if (einst) | |
579 { | |
580 // Create header | |
581 jssE.nsamples = einst->nsamples; | |
582 for (i = 0; i < jsetNNotes; i++) | |
583 { | |
584 int snum = einst->sNumForNotes[i]; | |
1118
de25e0f2b856
Fix sNumForNotes conversion/handling in JSSMOD loader and xm2jss.
Matti Hamalainen <ccr@tnsp.org>
parents:
1116
diff
changeset
|
585 jssE.sNumForNotes[i] = (snum != jsetNotSet) ? snum + 1: 0; |
0 | 586 } |
587 | |
588 jssCopyEnvelope(&jssE.volumeEnv, &(einst->volumeEnv)); | |
589 jssCopyEnvelope(&jssE.panningEnv, &(einst->panningEnv)); | |
590 jssE.vibratoType = einst->vibratoType; | |
591 jssE.vibratoSweep = einst->vibratoSweep; | |
592 jssE.vibratoDepth = einst->vibratoDepth; | |
593 jssE.fadeOut = einst->fadeOut; | |
594 } else | |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
595 JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Extended instrument #%d NULL!\n", instr); |
0 | 596 |
597 // Write to file | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
598 totalSize += sizeof(jssE); |
0 | 599 if (fwrite(&jssE, sizeof(jssE), 1, outFile) != 1) |
600 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, | |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
601 "Could not write JSSMOD extended instrument #%d to file!\n", instr); |
0 | 602 } |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
603 dmMsg(1," * %d Extended Instruments, %d bytes.\n", m->nextInstruments, totalSize); |
0 | 604 |
605 | |
606 // Write sample instrument headers | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
607 for (totalSize = instr = 0; instr < m->ninstruments; instr++) |
0 | 608 { |
609 JSSMODInstrument jssI; | |
1115 | 610 JSSInstrument *inst = m->instruments[instr]; |
0 | 611 |
1167 | 612 dmMemset(&jssI, 0, sizeof(jssI)); |
0 | 613 |
614 // Create header | |
1115 | 615 if (inst != NULL) |
0 | 616 { |
1115 | 617 jssI.size = inst->size; |
618 jssI.loopS = inst->loopS; | |
619 jssI.loopE = inst->loopE; | |
620 jssI.volume = inst->volume; | |
621 jssI.flags = inst->flags; | |
622 jssI.C4BaseSpeed = inst->C4BaseSpeed; | |
623 jssI.ERelNote = inst->ERelNote; | |
624 jssI.EFineTune = inst->EFineTune; | |
625 jssI.EPanning = inst->EPanning; | |
626 jssI.hasData = (inst->data != NULL) ? TRUE : FALSE; | |
627 jssI.convFlags = (inst->flags & jsf16bit) ? flags16 : flags8; | |
0 | 628 } |
629 else | |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
630 JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, "Instrument #%d NULL!\n", instr); |
0 | 631 |
632 // Write to file | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
633 totalSize += sizeof(jssI); |
0 | 634 if (fwrite(&jssI, sizeof(jssI), 1, outFile) != 1) |
635 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, | |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
636 "Could not write JSSMOD instrument #%d to file!\n", instr); |
0 | 637 } |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
638 dmMsg(1," * %d Instrument headers, %d bytes.\n", m->ninstruments, totalSize); |
0 | 639 |
640 // Write sample data | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
641 for (totalSize = instr = 0; instr < m->ninstruments; instr++) |
0 | 642 if (m->instruments[instr]) |
643 { | |
644 JSSInstrument *inst = m->instruments[instr]; | |
645 if (inst->data != NULL) | |
646 { | |
647 size_t res; | |
648 if (inst->flags & jsf16bit) | |
649 { | |
650 jssEncodeSample16(inst->data, inst->size, flags16); | |
651 res = fwrite(inst->data, sizeof(Uint16), inst->size, outFile); | |
652 } | |
653 else | |
654 { | |
655 jssEncodeSample8(inst->data, inst->size, flags8); | |
656 res = fwrite(inst->data, sizeof(Uint8), inst->size, outFile); | |
657 } | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
658 |
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
659 totalSize += inst->size; |
86 | 660 if (res != (size_t) inst->size) |
0 | 661 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
662 "Could not write JSSMOD sample #%d to file!\n", instr); |
0 | 663 } |
664 } | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
665 dmMsg(1," * %d samples, %d bytes.\n", m->ninstruments, totalSize); |
0 | 666 |
667 return DMERR_OK; | |
668 } | |
669 | |
670 | |
671 /* Optimize a given module | |
672 */ | |
673 JSSModule *optimizeModule(JSSModule *m) | |
674 { | |
675 BOOL usedPatterns[jsetMaxPatterns + 1], | |
676 usedInstruments[jsetMaxInstruments + 1], | |
677 usedExtInstruments[jsetMaxInstruments + 1]; | |
678 int mapExtInstruments[jsetMaxInstruments + 1], | |
679 mapInstruments[jsetMaxInstruments + 1], | |
680 mapPatterns[jsetMaxPatterns + 1]; | |
681 JSSModule *r = NULL; | |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
682 int i, n8, n16, unused; |
0 | 683 |
684 // Allocate a new module | |
685 if ((r = jssAllocateModule()) == NULL) | |
686 return NULL; | |
687 | |
688 // Copy things | |
689 r->moduleType = m->moduleType; | |
690 r->moduleName = dm_strdup(m->moduleName); | |
691 r->trackerName = dm_strdup(m->trackerName); | |
692 r->defSpeed = m->defSpeed; | |
693 r->defTempo = m->defTempo; | |
694 r->defFlags = m->defFlags; | |
695 r->defRestartPos = m->defRestartPos; | |
696 r->intVersion = m->intVersion; | |
697 r->nchannels = m->nchannels; | |
698 r->norders = m->norders; | |
699 for (i = 0; i < jsetNChannels; i++) | |
700 r->defPanning[i] = m->defPanning[i]; | |
701 | |
702 // Initialize values | |
703 for (i = 0; i <= jsetMaxInstruments; i++) | |
704 { | |
705 usedExtInstruments[i] = FALSE; | |
798 | 706 usedInstruments[i] = FALSE; |
707 mapExtInstruments[i] = jsetNotSet; | |
708 mapInstruments[i] = jsetNotSet; | |
0 | 709 } |
710 | |
711 for (i = 0; i <= jsetMaxPatterns; i++) | |
712 { | |
713 usedPatterns[i] = FALSE; | |
798 | 714 mapPatterns[i] = jsetNotSet; |
0 | 715 } |
716 | |
1094 | 717 // |
798 | 718 // Find out all actually used patterns and ext.instruments |
1100 | 719 // by going through all patterns specified in the order list |
1094 | 720 // |
0 | 721 for (i = 0; i < m->norders; i++) |
722 { | |
723 int pattern = m->orderList[i]; | |
724 if (pattern >= 0 && pattern < m->npatterns) | |
725 { | |
726 JSSPattern *p = m->patterns[pattern]; | |
727 if (p != NULL) | |
728 { | |
729 int row, channel; | |
730 JSSNote *n = p->data; | |
731 | |
1100 | 732 // Mark this pattern as used |
0 | 733 usedPatterns[pattern] = TRUE; |
734 | |
1100 | 735 // Check all notes in this pattern to see what instruments are used |
0 | 736 for (row = 0; row < p->nrows; row++) |
737 for (channel = 0; channel < p->nchannels; channel++, n++) | |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
738 if (n->instrument != jsetNotSet) |
0 | 739 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
740 if (n->instrument >= 0 && n->instrument < m->nextInstruments) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
741 usedExtInstruments[n->instrument] = TRUE; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
742 else |
0 | 743 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
744 dmMsg(2, "Pattern 0x%x, row=0x%x, chn=%d has invalid instrument 0x%x\n", |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
745 pattern, row, channel, n->instrument + 1); |
0 | 746 } |
747 } | |
748 } | |
749 else | |
750 { | |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
751 dmErrorMsg("Pattern 0x%x is used on order 0x%x, but has no data!\n", |
1094 | 752 pattern, i); |
807
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
753 |
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
754 // Fix it. |
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
755 m->orderList[i] = jsetMaxPatterns; |
0 | 756 } |
757 } | |
758 else | |
759 if (pattern != jsetMaxPatterns) | |
760 { | |
1101 | 761 dmErrorMsg("Order 0x%x has invalid pattern number 0x%x, changing to empty!\n", |
1094 | 762 i, pattern); |
807
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
763 |
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
764 // Fix it. |
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
765 m->orderList[i] = jsetMaxPatterns; |
0 | 766 } |
767 } | |
768 | |
1094 | 769 // |
1100 | 770 // Find used sample instruments |
1094 | 771 // |
1101 | 772 dmMsg(1, "Checking ext.instruments for used sample instruments...\n"); |
856
415cc781e127
Fix some brain farts in instrument remapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
773 for (i = 0; i < jsetMaxInstruments; i++) |
0 | 774 if (usedExtInstruments[i] && m->extInstruments[i] != NULL) |
775 { | |
776 int note; | |
777 JSSExtInstrument *e = m->extInstruments[i]; | |
1094 | 778 |
0 | 779 for (note = 0; note < jsetNNotes; note++) |
780 if (e->sNumForNotes[note] != jsetNotSet) | |
781 { | |
782 int q = e->sNumForNotes[note]; | |
783 if (q >= 0 && q < m->ninstruments) | |
784 { | |
785 usedInstruments[q] = TRUE; | |
786 } | |
787 else | |
788 { | |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
789 dmErrorMsg("Ext.instrument #%d sNumForNotes[%d] value out range (%d < %d).\n", |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
790 i + 1, m->ninstruments, q + 1); |
0 | 791 } |
792 } | |
793 } | |
1094 | 794 |
795 // | |
0 | 796 // Create pattern mappings |
1094 | 797 // |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
798 dmMsg(1, "Creating pattern remaps...\n"); |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
799 for (unused = i = 0; i <= jsetMaxPatterns; i++) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
800 if (usedPatterns[i]) |
0 | 801 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
802 JSSPattern *pat; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
803 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
804 if (i >= m->npatterns) |
0 | 805 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
806 dmErrorMsg("Pattern 0x%x >= 0x%x, but used!\n", i, m->npatterns); |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
807 continue; |
0 | 808 } |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
809 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
810 if ((pat = m->patterns[i]) == NULL) |
0 | 811 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
812 dmErrorMsg("Pattern 0x%x used but is NULL.\n", i); |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
813 continue; |
0 | 814 } |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
815 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
816 mapPatterns[i] = r->npatterns; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
817 r->patterns[r->npatterns] = m->patterns[i]; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
818 (r->npatterns)++; |
0 | 819 } |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
820 else |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
821 if (m->patterns[i] != NULL) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
822 unused++; |
1094 | 823 |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
824 dmMsg(1, "%d used patterns (%d unused).\n", |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
825 r->npatterns, unused); |
0 | 826 |
827 | |
1094 | 828 // |
0 | 829 // Re-map instruments |
1094 | 830 // |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
831 dmMsg(1, "Creating sample instrument remaps...\n"); |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
832 for (unused = n8 = n16 = i = 0; i < jsetMaxInstruments; i++) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
833 if (usedInstruments[i]) |
0 | 834 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
835 JSSInstrument *ip; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
836 if (optStripInstr) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
837 continue; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
838 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
839 if (i >= m->ninstruments) |
0 | 840 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
841 dmErrorMsg("Instrument 0x%x >= 0x%x, but used!\n", |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
842 i + 1, m->ninstruments); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
843 continue; |
0 | 844 } |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
845 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
846 if ((ip = m->instruments[i]) == NULL) |
0 | 847 { |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
848 dmErrorMsg("Instrument 0x%x used but is NULL.\n", i + 1); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
849 continue; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
850 } |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
851 |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
852 dmPrint(2, "%02x -> %02x : ", i + 1, r->ninstruments + 1); |
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
853 |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
854 mapInstruments[i] = r->ninstruments; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
855 r->instruments[r->ninstruments] = ip; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
856 (r->ninstruments)++; |
0 | 857 |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
858 if (ip->flags & jsf16bit) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
859 n16++; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
860 else |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
861 n8++; |
0 | 862 } |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
863 else |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
864 if (m->instruments[i] != NULL) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
865 unused++; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
866 |
0 | 867 dmPrint(2, "\n"); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
868 dmMsg(1, "Total of %d [16-bit] + %d [8-bit] samples = %d instruments (%d unused).\n", |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
869 n16, n8, r->ninstruments, unused); |
0 | 870 |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
871 // |
0 | 872 // Re-map ext.instruments |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
873 // |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
874 dmMsg(1, "Creating ext.instrument remaps...\n"); |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
875 for (unused = i = 0; i < jsetMaxInstruments; i++) |
0 | 876 if (usedExtInstruments[i]) |
877 { | |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
878 JSSExtInstrument *eip; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
879 int note; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
880 if (optStripExtInstr) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
881 continue; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
882 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
883 if (i >= m->nextInstruments) |
0 | 884 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
885 dmErrorMsg("Ext.instrument 0x%x >= 0x%x, but used!\n", |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
886 i + 1, m->nextInstruments); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
887 continue; |
0 | 888 } |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
889 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
890 if ((eip = m->extInstruments[i]) == NULL) |
0 | 891 { |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
892 dmErrorMsg("Extended instrument 0x%x used but is NULL.\n", i + 1); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
893 continue; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
894 } |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
895 |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
896 dmPrint(2, "%02x -> %02x : ", i + 1, r->nextInstruments + 1); |
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
897 |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
898 mapExtInstruments[i] = r->nextInstruments; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
899 r->extInstruments[r->nextInstruments] = eip; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
900 (r->nextInstruments)++; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
901 |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
902 // Re-map sNumForNotes table for this ext.instrument |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
903 for (note = 0; note < jsetNNotes; note++) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
904 { |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
905 int q = eip->sNumForNotes[note]; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
906 if (q != jsetNotSet) |
0 | 907 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
908 int map; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
909 if (q >= 0 && q < jsetMaxInstruments) |
0 | 910 { |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
911 map = mapInstruments[q]; |
0 | 912 } |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
913 else |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
914 { |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
915 map = jsetNotSet; |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
916 dmErrorMsg("Einst=%d, note=%d, sNumForNote=%d (%d max)\n", |
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
917 i + 1, note, q + 1, r->ninstruments); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
918 } |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
919 |
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
920 dmPrint(3, "%02x.%02x ", q + 1, map + 1); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
921 eip->sNumForNotes[note] = map; |
0 | 922 } |
923 } | |
924 } | |
925 else | |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
926 if (m->extInstruments[i] != NULL) |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
927 unused++; |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
928 |
0 | 929 dmPrint(2, "\n"); |
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
930 dmMsg(1, "%d extended instruments (%d unused).\n", |
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
931 r->nextInstruments, unused); |
1094 | 932 |
933 // | |
934 // Remap pattern data with remapped instrument data | |
935 // | |
0 | 936 for (i = 0; i < r->npatterns; i++) |
937 { | |
938 int row, channel; | |
939 JSSPattern *p = r->patterns[i]; | |
940 JSSNote *n = p->data; | |
941 | |
942 for (row = 0; row < p->nrows; row++) | |
943 for (channel = 0; channel < p->nchannels; channel++, n++) | |
944 { | |
184
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
945 char effect; |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
946 |
1109 | 947 // If not stripping extended instruments, check for |
948 // the validity of the used instrument and remap | |
338
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
949 if (!optStripExtInstr) |
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
950 { |
856
415cc781e127
Fix some brain farts in instrument remapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
951 if (n->instrument >= 0 && n->instrument < jsetMaxInstruments) |
338
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
952 n->instrument = mapExtInstruments[n->instrument]; |
202
85614db5f577
Warn about invalid instruments.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
953 |
1116 | 954 if (n->instrument != jsetNotSet && |
955 r->extInstruments[n->instrument] == NULL) | |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
956 { |
1116 | 957 dmErrorMsg("Non-existing instrument used #%d, INTERNAL ERROR.\n", |
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
958 n->instrument + 1); |
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
959 } |
338
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
960 } |
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
961 |
184
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
962 JMPGETEFFECT(effect, n->effect); |
1094 | 963 |
184
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
964 switch (effect) |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
965 { |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
966 case 'C': // Cxx = Set volume |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
967 if (n->volume == jsetNotSet) |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
968 { |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
969 n->volume = n->param; |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
970 n->effect = jsetNotSet; |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
971 n->param = jsetNotSet; |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
972 } |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
973 break; |
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
974 } |
0 | 975 } |
976 } | |
977 | |
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
978 // |
0 | 979 // Remap orders list |
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
980 // |
0 | 981 for (i = 0; i < m->norders; i++) |
982 { | |
983 r->orderList[i] = mapPatterns[m->orderList[i]]; | |
984 } | |
985 | |
986 return r; | |
987 } | |
988 | |
989 | |
990 int main(int argc, char *argv[]) | |
991 { | |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
992 DMResource *inFile = NULL; |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
993 FILE *outFile = NULL; |
0 | 994 JSSModule *sm, *dm; |
995 int result; | |
996 | |
997 dmInitProg("xm2jss", "XM to JSSMOD converter", "0.6", NULL, NULL); | |
998 dmVerbosity = 0; | |
999 | |
1000 // Parse arguments | |
1001 if (!dmArgsProcess(argc, argv, optList, optListN, | |
860
daebbf28953d
The argument handling API in dmargs* was synced with th-libs.
Matti Hamalainen <ccr@tnsp.org>
parents:
856
diff
changeset
|
1002 argHandleOpt, argHandleFile, OPTH_BAILOUT)) |
0 | 1003 exit(1); |
1004 | |
300 | 1005 // Check arguments |
1006 if (optInFilename == NULL || optOutFilename == NULL) | |
1007 { | |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
1008 dmErrorMsg("Input or output file not specified. Try --help.\n"); |
300 | 1009 return 1; |
1010 } | |
0 | 1011 |
1012 // Read the source file | |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1013 if ((result = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) |
0 | 1014 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
1015 dmErrorMsg("Error opening input file '%s', %d: %s\n", |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1016 optInFilename, result, dmErrorStr(result)); |
0 | 1017 return 1; |
1018 } | |
1019 | |
1020 // Initialize miniJSS | |
1021 jssInit(); | |
1022 | |
1023 // Read file | |
1024 dmMsg(1, "Reading XM-format file ...\n"); | |
797
f066e9dccf29
Oops, fix some inverted booleans.
Matti Hamalainen <ccr@tnsp.org>
parents:
796
diff
changeset
|
1025 result = jssLoadXM(inFile, &sm, FALSE); |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1026 dmf_close(inFile); |
0 | 1027 if (result != 0) |
1028 { | |
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
1029 dmErrorMsg("Error while loading XM file (%d), ", result); |
0 | 1030 if (optIgnoreErrors) |
1031 fprintf(stderr, "ignoring. This may cause problems.\n"); | |
1032 else | |
1033 { | |
1034 fprintf(stderr, "giving up. Use --ignore if you want to try to convert anyway.\n"); | |
1035 return 2; | |
1036 } | |
1037 } | |
1038 | |
1039 // Check stripping settings | |
1040 if (optStripExtInstr) optStripInstr = TRUE; | |
1041 if (optStripInstr) optStripSamples = TRUE; | |
1042 | |
1043 // Remove samples | |
1044 if (optStripSamples) | |
1045 { | |
1046 int i; | |
1047 | |
1048 dmMsg(1, "Stripping samples...\n"); | |
1049 for (i = 0; i < sm->ninstruments; i++) | |
1050 { | |
1051 dmFree(sm->instruments[i]->data); | |
1052 sm->instruments[i]->data = NULL; | |
1053 } | |
1054 } | |
1055 | |
1056 // Remove instruments | |
1057 if (optStripInstr) | |
1058 { | |
1059 int i; | |
1060 | |
1061 dmMsg(1, "Stripping instruments...\n"); | |
1062 for (i = 0; i < sm->ninstruments; i++) | |
1063 { | |
1064 dmFree(sm->instruments[i]); | |
1065 sm->instruments[i] = NULL; | |
1066 } | |
1067 sm->ninstruments = 0; | |
1068 } | |
1069 | |
1070 // Remove ext.instruments | |
1071 if (optStripExtInstr) | |
1072 { | |
1073 int i; | |
1074 | |
1075 dmMsg(1, "Stripping ext.instruments...\n"); | |
1076 for (i = 0; i < sm->nextInstruments; i++) | |
1077 { | |
1078 dmFree(sm->extInstruments[i]); | |
1079 sm->extInstruments[i] = NULL; | |
1080 } | |
1081 sm->nextInstruments = 0; | |
1082 } | |
1109 | 1083 |
0 | 1084 // Run the optimization procedure |
1085 if (optOptimize) | |
1086 { | |
1087 dmMsg(1, "Optimizing module data...\n"); | |
1088 dm = optimizeModule(sm); | |
1089 } else | |
1090 dm = sm; | |
1091 | |
1092 // Write output file | |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1093 if ((outFile = fopen(optOutFilename, "wb")) == NULL) |
0 | 1094 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
1095 dmErrorMsg("Error creating output file '%s', %d: %s\n", |
300 | 1096 optOutFilename, errno, strerror(errno)); |
0 | 1097 return 1; |
1098 } | |
1099 | |
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1100 dmMsg(1, "Writing JSSMOD-format file [patMode=0x%04x, samp8=0x%02x, samp16=0x%02x]\n", |
0 | 1101 optPatternMode, optSampMode8, optSampMode16); |
1102 | |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1103 result = jssSaveJSSMOD(outFile, dm, optPatternMode, optSampMode8, optSampMode16); |
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1104 |
1114
7aaab1533c90
Free the source module data at end.
Matti Hamalainen <ccr@tnsp.org>
parents:
1113
diff
changeset
|
1105 dmFree(sm); |
7aaab1533c90
Free the source module data at end.
Matti Hamalainen <ccr@tnsp.org>
parents:
1113
diff
changeset
|
1106 |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1107 fclose(outFile); |
0 | 1108 |
1109 if (result != 0) | |
1110 { | |
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1111 dmErrorMsg( |
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1112 "Error while saving JSSMOD file, %d: %s\n" |
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1113 "WARNING: The resulting file may be broken!\n", |
300 | 1114 result, dmErrorStr(result)); |
0 | 1115 } |
300 | 1116 else |
1117 { | |
1118 dmMsg(1, "Conversion complete.\n"); | |
1119 } | |
0 | 1120 return 0; |
1121 } |