Mercurial > hg > dmlib
annotate tools/xm2jss.c @ 1431:ed04fb6da07c
Get rid of direct 'errno' usage.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Wed, 22 Nov 2017 01:04:41 +0200 |
| parents | 0ecd5accea1e |
| children | a9516570cc26 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * xm2jss - Convert XM module to JSSMOD | |
| 3 * Programmed and designed by Matti 'ccr' Hamalainen | |
|
1333
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
4 * (C) Copyright 2006-2017 Tecnic Software productions (TNSP) |
| 0 | 5 * |
| 6 * Please read file 'COPYING' for information on license and distribution. | |
| 7 */ | |
| 8 #include <stdio.h> | |
| 9 #include "jss.h" | |
| 10 #include "jssmod.h" | |
|
184
50f55def91e5
Add a minor optimization in the conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
86
diff
changeset
|
11 #include "jssplr.h" |
| 0 | 12 #include "dmlib.h" |
| 13 #include "dmargs.h" | |
| 14 #include "dmres.h" | |
|
1241
5e2b90e3e4bc
Fix hasData handling and include dmfile.h header.
Matti Hamalainen <ccr@tnsp.org>
parents:
1237
diff
changeset
|
15 #include "dmfile.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 { | |
| 337 | 65 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
|
66 dmArgsPrintHelp(stdout, optList, optListN, 0); |
| 0 | 67 |
| 68 printf("\n" | |
| 69 "Pattern storage modes:\n"); | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
70 |
| 1313 | 71 for (int i = 1; i < PATMODE_LAST; i++) |
| 0 | 72 printf(" %d = %s\n", i, patModeTable[i-1]); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
73 |
| 0 | 74 printf( |
| 75 "\n" | |
| 76 "Sample data conversion flags (summative):\n" | |
| 77 " 1 = Delta encoding (DEF 8 & 16)\n" | |
| 78 " 2 = Flip signedness (DEF 8)\n" | |
| 79 " 4 = Swap endianess (affects 16-bit only)\n" | |
| 80 " 8 = Split and de-interleave hi/lo bytes (affects 16-bit only)\n" | |
| 81 "\n" | |
| 82 ); | |
| 83 } | |
| 84 | |
| 85 BOOL argHandleOpt(const int optN, char *optArg, char *currArg) | |
| 86 { | |
| 87 (void) optArg; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
88 |
| 0 | 89 switch (optN) |
| 90 { | |
| 91 case 0: | |
| 92 argShowHelp(); | |
| 93 exit(0); | |
| 94 break; | |
| 95 | |
| 96 case 1: | |
| 337 | 97 dmVerbosity++; |
| 98 break; | |
| 99 | |
| 100 case 2: | |
| 0 | 101 optIgnoreErrors = TRUE; |
| 102 break; | |
| 103 | |
| 337 | 104 case 3: |
| 0 | 105 optPatternMode = atoi(optArg); |
| 106 if (optPatternMode <= 0 || optPatternMode >= PATMODE_LAST) | |
| 107 { | |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
108 dmErrorMsg("Unknown pattern conversion mode %d\n", optPatternMode); |
| 0 | 109 return FALSE; |
| 110 } | |
| 111 break; | |
| 112 | |
| 337 | 113 case 4: optStripExtInstr = TRUE; break; |
| 114 case 5: optStripInstr = TRUE; break; | |
| 115 case 6: optStripSamples = TRUE; break; | |
| 116 | |
| 1099 | 117 case 7: optSampMode8 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break; |
| 118 case 8: optSampMode16 = atoi(optArg) & JM_SAMPLE_MODE_MASK; break; | |
| 0 | 119 |
| 337 | 120 case 9: optOptimize = TRUE; break; |
| 0 | 121 |
| 122 default: | |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
123 dmErrorMsg("Unknown argument '%s'.\n", currArg); |
| 0 | 124 return FALSE; |
| 125 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
126 |
| 0 | 127 return TRUE; |
| 128 } | |
| 129 | |
| 130 | |
| 131 BOOL argHandleFile(char *currArg) | |
| 132 { | |
| 133 // Was not option argument | |
| 300 | 134 if (!optInFilename) |
| 135 optInFilename = currArg; | |
| 337 | 136 else |
| 300 | 137 if (!optOutFilename) |
| 138 optOutFilename = currArg; | |
| 0 | 139 else |
| 140 { | |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
141 dmErrorMsg("Too many filename arguments specified, '%s'.\n", currArg); |
| 0 | 142 return FALSE; |
| 143 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
144 |
| 0 | 145 return TRUE; |
| 146 } | |
| 147 | |
| 148 | |
| 149 /* These functions and the macro mess are meant to make the | |
| 150 * conversion routines themselves clearer and simpler. | |
| 151 */ | |
| 152 BOOL jsPutByte(Uint8 *patBuf, size_t patBufSize, size_t *npatBuf, Uint8 val) | |
| 153 { | |
| 154 if (*npatBuf >= patBufSize) | |
| 155 return FALSE; | |
| 156 else | |
| 157 { | |
| 158 patBuf[*npatBuf] = val; | |
| 159 (*npatBuf)++; | |
| 160 return TRUE; | |
| 161 } | |
| 162 } | |
| 163 | |
| 164 #define JSPUTBYTE(x) do { if (!jsPutByte(patBuf, patBufSize, patSize, x)) return DMERR_BOUNDS; } while (0) | |
| 165 | |
| 166 #define JSCOMP(x,z) do { if ((x) != jsetNotSet) { qflags |= (z); qcomp++; } } while (0) | |
| 167 | |
| 168 #define JSCOMPPUT(xf,xv,qv) do { \ | |
| 169 if (qflags & (xf)) { \ | |
| 170 if ((xv) < 0 || (xv) > 255) \ | |
| 171 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, \ | |
| 172 "%s value out of bounds %d.\n", qv, (xv)); \ | |
| 173 JSPUTBYTE(xv); \ | |
| 174 } \ | |
| 175 } while (0) | |
| 176 | |
| 177 #define JSCONVPUT(xv,qv) do { \ | |
| 178 if ((xv) != jsetNotSet) { \ | |
| 179 if ((xv) < 0 || (xv) > 254) \ | |
| 180 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, \ | |
| 181 "%s value out of bounds %d.\n", qv, (xv)); \ | |
| 182 JSPUTBYTE((xv) + 1); \ | |
| 183 } else { \ | |
| 184 JSPUTBYTE(0); \ | |
| 185 } \ | |
| 186 } while (0) | |
| 187 | |
| 188 | |
| 189 /* Convert a note | |
| 190 */ | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
191 static int jssConvertNote( |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
192 Uint8 *patBuf, const size_t patBufSize, |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
193 size_t *patSize, const JSSNote *pnote) |
| 0 | 194 { |
| 195 Uint8 tmp; | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
196 if (pnote->note == jsetNotSet) |
| 0 | 197 tmp = 0; |
| 1194 | 198 else |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
199 if (pnote->note == jsetNoteOff) |
| 0 | 200 tmp = 127; |
| 201 else | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
202 tmp = pnote->note + 1; |
| 0 | 203 |
| 204 if (tmp > 0x7f) | |
| 205 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp); | |
| 206 | |
| 207 JSPUTBYTE(tmp & 0x7f); | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
208 |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
209 JSCONVPUT(pnote->instrument, "Instrument"); |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
210 JSCONVPUT(pnote->volume, "Volume"); |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
211 JSCONVPUT(pnote->effect, "Effect"); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
212 |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
213 tmp = (pnote->param != jsetNotSet) ? pnote->param : 0; |
| 0 | 214 JSPUTBYTE(tmp); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
215 |
| 0 | 216 return DMERR_OK; |
| 217 } | |
| 218 | |
| 219 | |
| 220 /* Compress a note | |
| 221 */ | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
222 static int jssCompressNote( |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
223 Uint8 *patBuf, const size_t patBufSize, |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
224 size_t *patSize, const JSSNote *pnote) |
| 0 | 225 { |
| 226 Uint8 qflags = 0; | |
| 227 int qcomp = 0; | |
| 1201 | 228 |
| 229 // Determine what would get stored, | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
230 // 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
|
231 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
|
232 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
|
233 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
|
234 JSCOMP(pnote->effect, JM_COMP_EFFECT); |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
235 if (pnote->param != jsetNotSet && pnote->param != 0) |
| 0 | 236 { |
|
1210
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
237 qflags |= JM_COMP_PARAM; |
| 0 | 238 qcomp++; |
| 239 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
240 |
| 0 | 241 if (qcomp < 4) |
| 242 { | |
| 1201 | 243 // Okay, it's less than 4 bytes, so use compressed |
| 0 | 244 JSPUTBYTE(qflags | 0x80); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
245 |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
246 if (pnote->note != jsetNotSet) |
| 0 | 247 { |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
248 Uint8 tmp = (pnote->note != jsetNoteOff) ? pnote->note : 127; |
| 0 | 249 if (tmp > 0x7f) |
| 250 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp); | |
| 251 JSPUTBYTE(tmp); | |
| 252 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
253 |
|
1210
6b48bad13399
Rename pattern note packing flag COMP_* constants to JM_COMP_*.
Matti Hamalainen <ccr@tnsp.org>
parents:
1209
diff
changeset
|
254 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
|
255 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
|
256 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
|
257 JSCOMPPUT(JM_COMP_PARAM, pnote->param, "Param"); |
| 1201 | 258 } |
| 259 else | |
| 260 { | |
| 261 // Was 4 bytes or more, just dump it all in .. | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
262 return jssConvertNote(patBuf, patBufSize, patSize, pnote); |
| 1201 | 263 } |
| 264 | |
| 0 | 265 return DMERR_OK; |
| 266 } | |
| 267 | |
| 268 | |
| 269 /* Compress pattern | |
| 270 */ | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
271 static int jssConvertPatternCompHoriz( |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
272 Uint8 *patBuf, const size_t patBufSize, |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
273 size_t *patSize, const JSSPattern *pattern) |
| 0 | 274 { |
| 275 *patSize = 0; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
276 |
| 1336 | 277 for (int row = 0; row < pattern->nrows; row++) |
| 278 for (int channel = 0; channel < pattern->nchannels; channel++) | |
| 0 | 279 { |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
280 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
281 const int res = jssCompressNote(patBuf, patBufSize, patSize, pnote); |
| 0 | 282 if (res != DMERR_OK) |
| 283 { | |
| 284 JSSERROR(res, res, "Note compression failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
| 285 patBuf, patBufSize, *patSize, row, channel); | |
| 286 return res; | |
| 287 } | |
| 288 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
289 |
| 0 | 290 return DMERR_OK; |
| 291 } | |
| 292 | |
| 293 | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
294 static int jssConvertPatternCompVert( |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
295 Uint8 *patBuf, const size_t patBufSize, |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
296 size_t *patSize, const JSSPattern *pattern) |
| 0 | 297 { |
| 298 *patSize = 0; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
299 |
| 1336 | 300 for (int channel = 0; channel < pattern->nchannels; channel++) |
| 301 for (int row = 0; row < pattern->nrows; row++) | |
| 0 | 302 { |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
303 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
304 const int res = jssCompressNote(patBuf, patBufSize, patSize, pnote); |
| 0 | 305 if (res != DMERR_OK) |
| 306 { | |
| 307 JSSERROR(res, res, "Note compression failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
| 308 patBuf, patBufSize, *patSize, row, channel); | |
| 309 return res; | |
| 310 } | |
| 311 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
312 |
| 0 | 313 return DMERR_OK; |
| 314 } | |
| 315 | |
| 316 | |
| 317 /* Convert a pattern | |
| 318 */ | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
319 static int jssConvertPatternRawHoriz( |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
320 Uint8 *patBuf, const size_t patBufSize, |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
321 size_t *patSize, const JSSPattern *pattern) |
| 0 | 322 { |
| 323 *patSize = 0; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
324 |
| 1336 | 325 for (int row = 0; row < pattern->nrows; row++) |
| 326 for (int channel = 0; channel < pattern->nchannels; channel++) | |
| 0 | 327 { |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
328 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
329 const int res = jssConvertNote(patBuf, patBufSize, patSize, pnote); |
| 0 | 330 if (res != DMERR_OK) |
| 331 { | |
| 332 JSSERROR(res, res, "Note conversion failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
| 333 patBuf, patBufSize, *patSize, row, channel); | |
| 334 return res; | |
| 335 } | |
| 336 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
337 |
| 0 | 338 return DMERR_OK; |
| 339 } | |
| 340 | |
| 341 | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
342 static int jssConvertPatternRawVert( |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
343 Uint8 *patBuf, const size_t patBufSize, |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
344 size_t *patSize, const JSSPattern *pattern) |
| 0 | 345 { |
| 346 *patSize = 0; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
347 |
| 1336 | 348 for (int channel = 0; channel < pattern->nchannels; channel++) |
| 349 for (int row = 0; row < pattern->nrows; row++) | |
| 0 | 350 { |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
351 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
352 const int res = jssConvertNote(patBuf, patBufSize, patSize, pnote); |
| 0 | 353 if (res != DMERR_OK) |
| 354 { | |
| 355 JSSERROR(res, res, "Note conversion failed [patBuf=%p, patBufSize=%d, patSize=%d, row=%d, chn=%d]\n", | |
| 356 patBuf, patBufSize, *patSize, row, channel); | |
| 357 return res; | |
| 358 } | |
| 359 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
360 |
| 0 | 361 return DMERR_OK; |
| 362 } | |
| 363 | |
| 364 | |
| 365 #define JSFOREACHNOTE1 \ | |
| 366 for (channel = 0; channel < pattern->nchannels; channel++) \ | |
| 367 for (row = 0; row < pattern->nrows; row++) { \ | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
368 const JSSNote *pnote = &pattern->data[(pattern->nchannels * row) + channel]; |
| 0 | 369 |
| 370 #define JSFOREACHNOTE2 } | |
| 371 | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
372 static int jssConvertPatternRawElem( |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
373 Uint8 *patBuf, const size_t patBufSize, |
|
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
374 size_t *patSize, const JSSPattern *pattern) |
| 0 | 375 { |
| 376 Uint8 tmp; | |
| 377 int row, channel; | |
| 378 *patSize = 0; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
379 |
| 0 | 380 JSFOREACHNOTE1; |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
381 if (pnote->note == jsetNotSet) |
| 0 | 382 tmp = 0; |
| 1194 | 383 else |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
384 if (pnote->note == jsetNoteOff) |
| 0 | 385 tmp = 127; |
| 386 else | |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
387 tmp = pnote->note + 1; |
| 1194 | 388 |
| 0 | 389 if (tmp > 0x7f) |
| 390 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, "Note value out of bounds %d > 0x7f.\n", tmp); | |
| 1194 | 391 |
| 0 | 392 JSPUTBYTE(tmp); |
| 393 JSFOREACHNOTE2; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
394 |
| 0 | 395 JSFOREACHNOTE1; |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
396 JSCONVPUT(pnote->instrument, "Instrument"); |
| 0 | 397 JSFOREACHNOTE2; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
398 |
| 0 | 399 JSFOREACHNOTE1; |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
400 JSCONVPUT(pnote->volume, "Volume"); |
| 0 | 401 JSFOREACHNOTE2; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
402 |
| 0 | 403 JSFOREACHNOTE1; |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
404 JSCONVPUT(pnote->effect, "Effect"); |
| 0 | 405 JSFOREACHNOTE2; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
406 |
| 0 | 407 JSFOREACHNOTE1; |
|
1207
59b5821b5cf9
Rename function arguments.
Matti Hamalainen <ccr@tnsp.org>
parents:
1201
diff
changeset
|
408 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
|
409 JSPUTBYTE(tmp); |
| 0 | 410 JSFOREACHNOTE2; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
411 |
| 0 | 412 return DMERR_OK; |
| 413 } | |
| 414 | |
| 415 #undef JSFOREACHNOTE1 | |
| 416 #undef JSFOREACHNOTE2 | |
| 417 | |
| 418 | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
419 static BOOL jssMODWriteEnvelope(FILE *outFile, JSSEnvelope *env, const char *name, const int ninst) |
| 0 | 420 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
421 BOOL ok = |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
422 dm_fwrite_byte(outFile, env->flags) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
423 dm_fwrite_byte(outFile, env->npoints) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
424 dm_fwrite_byte(outFile, env->sustain) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
425 dm_fwrite_byte(outFile, env->loopS) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
426 dm_fwrite_byte(outFile, env->loopE); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
427 |
| 1313 | 428 for (int i = 0; ok && i < env->npoints; i++) |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
429 { |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
430 ok = |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
431 dm_fwrite_le16(outFile, env->points[i].frame) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
432 dm_fwrite_le16(outFile, env->points[i].value); |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
433 } |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
434 |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
435 if (!ok) |
| 0 | 436 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
437 JSSERROR(DMERR_FWRITE, ok, |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
438 "Failed to write JSSMOD %s-envelope for instrument #%d.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
439 name, ninst); |
| 0 | 440 } |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
441 |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
442 return ok; |
| 0 | 443 } |
| 444 | |
| 445 | |
| 446 /* Save a JSSMOD file | |
| 447 */ | |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
448 int jssSaveJSSMOD(FILE *outFile, JSSModule *module, int patMode, int flags8, int flags16) |
| 0 | 449 { |
| 450 JSSMODHeader jssH; | |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
451 const size_t patBufSize = 256*1024; // 256kB pattern buffer |
| 0 | 452 Uint8 *patBuf; |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
453 size_t totalSize; |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
454 int index; |
| 0 | 455 |
| 456 // Check the module | |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
457 if (module == NULL) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
458 { |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
459 JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR, |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
460 "Module pointer was NULL\n"); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
461 } |
| 0 | 462 |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
463 if (module->nchannels < 1 || module->npatterns < 1 || module->norders < 1 || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
464 module->nchannels > jsetMaxChannels || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
465 module->npatterns > jsetMaxPatterns || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
466 module->norders > jsetMaxOrders) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
467 { |
| 0 | 468 JSSERROR(DMERR_BOUNDS, DMERR_BOUNDS, |
|
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
469 "Module had invalid values (nchannels=%d, npatterns=%d, norders=%d)\n", |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
470 module->nchannels, module->npatterns, module->norders); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
471 } |
| 0 | 472 |
| 473 // Create the JSSMOD header | |
| 474 jssH.idMagic[0] = 'J'; | |
| 475 jssH.idMagic[1] = 'M'; | |
| 476 jssH.idVersion = JSSMOD_VERSION; | |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
477 jssH.defFlags = module->defFlags; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
478 jssH.intVersion = module->intVersion; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
479 jssH.norders = module->norders; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
480 jssH.npatterns = module->npatterns; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
481 jssH.nextInstruments = module->nextInstruments; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
482 jssH.ninstruments = module->ninstruments; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
483 jssH.defRestartPos = module->defRestartPos; |
| 1231 | 484 |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
485 jssH.nchannels = module->nchannels; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
486 jssH.defSpeed = module->defSpeed; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
487 jssH.defTempo = module->defTempo; |
| 0 | 488 jssH.patMode = patMode; |
| 1209 | 489 |
| 0 | 490 // Write header |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
491 if (!dm_fwrite_str(outFile, jssH.idMagic, sizeof(jssH.idMagic)) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
492 !dm_fwrite_byte(outFile, jssH.idVersion) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
493 |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
494 !dm_fwrite_le16(outFile, jssH.defFlags) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
495 !dm_fwrite_le16(outFile, jssH.intVersion) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
496 !dm_fwrite_le16(outFile, jssH.norders) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
497 !dm_fwrite_le16(outFile, jssH.npatterns) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
498 !dm_fwrite_le16(outFile, jssH.nextInstruments) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
499 !dm_fwrite_le16(outFile, jssH.ninstruments) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
500 !dm_fwrite_le16(outFile, jssH.defRestartPos) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
501 |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
502 !dm_fwrite_byte(outFile, jssH.nchannels) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
503 !dm_fwrite_byte(outFile, jssH.defSpeed) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
504 !dm_fwrite_byte(outFile, jssH.defTempo) || |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
505 !dm_fwrite_byte(outFile, jssH.patMode)) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
506 { |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
507 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, |
|
1245
2a0488078b78
Cleanups, more consistent error messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
1244
diff
changeset
|
508 "Error writing JSSMOD header!\n"); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
509 } |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
510 |
|
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
511 totalSize = sizeof(jssH); |
|
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
512 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
|
513 |
| 0 | 514 // Write orders list |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
515 for (totalSize = index = 0; index < module->norders; index++) |
| 0 | 516 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
517 int tmp = module->orderList[index]; |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
518 if (tmp != jsetNotSet && tmp > module->npatterns) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
519 { |
|
1237
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
520 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA, |
|
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
521 "Orderlist entry #%d has invalid value %d.\n", |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
522 index, tmp); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
523 } |
|
1237
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
524 |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
525 if (tmp == jsetNotSet) |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
526 tmp = 0xffff; |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
527 |
|
1237
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
528 if (!dm_fwrite_le16(outFile, tmp)) |
|
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
529 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, |
|
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
530 "Could not write JSSMOD orders list entry #%d (%d).\n", |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
531 index, tmp); |
|
1237
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
532 |
|
8b6ed580e800
Add sanity check to order list writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1235
diff
changeset
|
533 totalSize += sizeof(Uint16); |
| 0 | 534 } |
| 535 | |
|
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
536 dmMsg(1," * %d item orders list, %d bytes.\n", |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
537 module->norders, totalSize); |
|
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
538 |
| 0 | 539 // Allocate pattern compression buffer |
| 540 if ((patBuf = dmMalloc(patBufSize)) == NULL) | |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
541 { |
| 0 | 542 JSSERROR(DMERR_MALLOC, DMERR_MALLOC, |
| 543 "Error allocating memory for pattern compression buffer.\n"); | |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
544 } |
|
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
545 |
| 1232 | 546 // Convert and write patterns |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
547 for (totalSize = index = 0; index < module->npatterns; index++) |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
548 if (module->patterns[index] != NULL) |
| 0 | 549 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
550 JSSPattern *pattern = module->patterns[index]; |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
551 size_t dataSize = 0; |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
552 int ret; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
553 |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
554 if (pattern->nrows > jsetMaxRows) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
555 { |
| 1232 | 556 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA, |
| 557 "Pattern #%d has %d rows > %d max.\n", | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
558 index, pattern->nrows, jsetMaxRows); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
559 } |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
560 |
| 0 | 561 switch (patMode) |
| 562 { | |
| 563 case PATMODE_RAW_HORIZ: | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
564 ret = jssConvertPatternRawHoriz(patBuf, patBufSize, &dataSize, pattern); |
| 0 | 565 break; |
| 566 case PATMODE_COMP_HORIZ: | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
567 ret = jssConvertPatternCompHoriz(patBuf, patBufSize, &dataSize, pattern); |
| 0 | 568 break; |
| 569 case PATMODE_RAW_VERT: | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
570 ret = jssConvertPatternRawVert(patBuf, patBufSize, &dataSize, pattern); |
| 0 | 571 break; |
| 572 case PATMODE_COMP_VERT: | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
573 ret = jssConvertPatternCompVert(patBuf, patBufSize, &dataSize, pattern); |
| 0 | 574 break; |
| 575 case PATMODE_RAW_ELEM: | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
576 ret = jssConvertPatternRawElem(patBuf, patBufSize, &dataSize, pattern); |
| 0 | 577 break; |
| 578 default: | |
| 579 JSSERROR(DMERR_INVALID_DATA, DMERR_INVALID_DATA, | |
|
1245
2a0488078b78
Cleanups, more consistent error messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
1244
diff
changeset
|
580 "Unsupported pattern conversion mode %d for pattern #%d.\n", |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
581 patMode, index); |
| 0 | 582 } |
| 583 | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
584 if (ret != DMERR_OK) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
585 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
586 JSSERROR(ret, ret, "Error converting pattern data #%d.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
587 pattern); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
588 } |
| 1211 | 589 |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
590 dmMsg(3, " - Pattern %d size %d bytes\n", index, dataSize); |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
591 totalSize += dataSize + sizeof(JSSMODPattern); |
| 0 | 592 |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
593 if (!dm_fwrite_le32(outFile, dataSize) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
594 !dm_fwrite_le16(outFile, pattern->nrows) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
595 !dm_fwrite_str(outFile, patBuf, dataSize)) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
596 { |
| 1211 | 597 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
598 "Error writing JSSMOD pattern #%d.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
599 index); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
600 } |
| 0 | 601 } |
| 1242 | 602 else |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
603 { |
| 1242 | 604 JSSERROR(DMERR_NULLPTR, DMERR_NULLPTR, |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
605 "Pattern #%d was NULL.\n", index); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
606 } |
| 1242 | 607 |
| 0 | 608 dmFree(patBuf); |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
609 dmMsg(1," * %d patterns, %d bytes.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
610 module->npatterns, totalSize); |
| 0 | 611 |
| 612 // Write extended instruments | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
613 for (totalSize = index = 0; index < module->nextInstruments; index++) |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
614 if (module->extInstruments[index] != NULL) |
| 0 | 615 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
616 JSSExtInstrument *einst = module->extInstruments[index]; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
617 |
| 1334 | 618 // Misc data |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
619 BOOL ok = |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
620 dm_fwrite_byte(outFile, einst->nsamples) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
621 dm_fwrite_byte(outFile, einst->vibratoType) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
622 dm_fwrite_le16(outFile, einst->vibratoSweep) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
623 dm_fwrite_le16(outFile, einst->vibratoDepth) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
624 dm_fwrite_le16(outFile, einst->vibratoRate) && |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
625 dm_fwrite_le16(outFile, einst->fadeOut); |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
626 |
| 1334 | 627 // Sample number for note(s) |
| 1313 | 628 for (int i = 0; ok && i < jsetNNotes; i++) |
| 0 | 629 { |
| 1242 | 630 int snum = einst->sNumForNotes[i]; |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
631 Uint32 tmp = (snum != jsetNotSet) ? snum + 1 : 0; |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
632 ok = dm_fwrite_le32(outFile, tmp); |
| 1242 | 633 } |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
634 |
| 1334 | 635 // Envelopes |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
636 if (!ok || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
637 !jssMODWriteEnvelope(outFile, &einst->volumeEnv, "volume", index) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
638 !jssMODWriteEnvelope(outFile, &einst->panningEnv, "panning", index)) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
639 { |
| 0 | 640 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
641 "Error writing JSSMOD extended instrument #%d.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
642 index); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
643 } |
| 0 | 644 |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
645 totalSize += sizeof(JSSMODExtInstrument); |
| 0 | 646 } |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
647 else |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
648 { |
|
1245
2a0488078b78
Cleanups, more consistent error messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
1244
diff
changeset
|
649 JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
650 "Extended instrument #%d NULL!\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
651 index); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
652 } |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
653 |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
654 dmMsg(1," * %d Extended Instruments, %d bytes.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
655 module->nextInstruments, totalSize); |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
656 |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
657 // Write sample instrument headers |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
658 for (totalSize = index = 0; index < module->ninstruments; index++) |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
659 if (module->instruments[index] != NULL) |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
660 { |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
661 JSSInstrument *inst = module->instruments[index]; |
| 1334 | 662 |
| 663 // Determine conversion flags to use | |
|
1315
7687412f9aef
Fix jssmod sample conversion flags storing .. urgh.
Matti Hamalainen <ccr@tnsp.org>
parents:
1313
diff
changeset
|
664 inst->convFlags = (inst->flags & jsf16bit) ? flags16 : flags8; |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
665 if (inst->data != NULL) |
|
1315
7687412f9aef
Fix jssmod sample conversion flags storing .. urgh.
Matti Hamalainen <ccr@tnsp.org>
parents:
1313
diff
changeset
|
666 inst->convFlags |= jsampHasData; |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
667 |
| 1334 | 668 // Write instrument header |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
669 if (!dm_fwrite_le32(outFile, inst->size) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
670 !dm_fwrite_le32(outFile, inst->loopS) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
671 !dm_fwrite_le32(outFile, inst->loopE) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
672 !dm_fwrite_le16(outFile, inst->flags) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
673 !dm_fwrite_le16(outFile, inst->C4BaseSpeed) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
674 !dm_fwrite_le16(outFile, inst->ERelNote) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
675 !dm_fwrite_le16(outFile, inst->EFineTune) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
676 !dm_fwrite_le16(outFile, inst->EPanning) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
677 !dm_fwrite_byte(outFile, inst->volume) || |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
678 !dm_fwrite_byte(outFile, inst->convFlags)) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
679 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
680 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
681 "Error writing JSSMOD instrument #%d.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
682 index); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
683 } |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
684 |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
685 totalSize += sizeof(JSSMODInstrument); |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
686 } |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
687 else |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
688 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
689 JSSWARNING(DMERR_NULLPTR, DMERR_NULLPTR, |
| 1334 | 690 "Instrument #%d NULL!\n", |
| 691 index); | |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
692 } |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
693 |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
694 dmMsg(1," * %d Instrument headers, %d bytes.\n", |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
695 module->ninstruments, totalSize); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
696 |
| 0 | 697 // Write sample data |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
698 for (totalSize = index = 0; index < module->ninstruments; index++) |
| 0 | 699 { |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
700 JSSInstrument *inst = module->instruments[index]; |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
701 if (inst != NULL && inst->data != NULL) |
| 0 | 702 { |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
703 size_t bsize = inst->size; |
| 0 | 704 if (inst->flags & jsf16bit) |
| 705 { | |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
706 bsize *= sizeof(Uint16); |
| 0 | 707 jssEncodeSample16(inst->data, inst->size, flags16); |
| 708 } | |
| 709 else | |
| 710 { | |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
711 bsize *= sizeof(Uint8); |
| 0 | 712 jssEncodeSample8(inst->data, inst->size, flags8); |
| 713 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
714 |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
715 if (!dm_fwrite_str(outFile, inst->data, bsize)) |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
716 { |
| 0 | 717 JSSERROR(DMERR_FWRITE, DMERR_FWRITE, |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
718 "Error writing JSSMOD sample data for instrument #%d.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
719 index); |
|
1310
dce4730372c7
Add some blocks, cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1249
diff
changeset
|
720 } |
|
1243
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
721 |
|
377c8a603d21
Cleanups in JSSMOD writing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1242
diff
changeset
|
722 totalSize += bsize; |
| 0 | 723 } |
| 724 } | |
|
1246
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
725 |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
726 dmMsg(1," * %d samples, %d bytes.\n", |
|
7bd50496c9ec
Work on improved module conversion.
Matti Hamalainen <ccr@tnsp.org>
parents:
1245
diff
changeset
|
727 module->ninstruments, totalSize); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
728 |
| 0 | 729 return DMERR_OK; |
| 730 } | |
| 731 | |
| 732 | |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
733 /* Scan given pattern for used instruments and channels. |
|
1342
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
734 * Also checks if the pattern is empty. |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
735 */ |
|
1342
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
736 void scanPattern(const JSSModule *module, const JSSPattern *pattern, |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
737 const int npattern, BOOL *usedExtInstruments, BOOL *usedChannels, BOOL *empty) |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
738 { |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
739 JSSNote *n = pattern->data; |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
740 *empty = FALSE; |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
741 |
| 1337 | 742 // Check all notes in this pattern |
| 1313 | 743 for (int row = 0; row < pattern->nrows; row++) |
| 744 for (int channel = 0; channel < pattern->nchannels; channel++, n++) | |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
745 { |
| 1337 | 746 // Is the instrument set? |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
747 if (n->instrument != jsetNotSet) |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
748 { |
| 1337 | 749 // Is it valid? |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
750 if (n->instrument >= 0 && n->instrument < module->nextInstruments) |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
751 usedExtInstruments[n->instrument] = TRUE; |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
752 else |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
753 { |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
754 dmMsg(2, "Pattern 0x%x, row=0x%x, chn=%d has invalid instrument 0x%x\n", |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
755 npattern + 1, row, channel, n->instrument + 1); |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
756 } |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
757 } |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
758 |
| 1337 | 759 // Check if this channel is used |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
760 if (n->note != jsetNotSet || |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
761 n->instrument != jsetNotSet || |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
762 n->volume != jsetNotSet || |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
763 n->effect != jsetNotSet || |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
764 n->param != jsetNotSet) |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
765 { |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
766 usedChannels[channel] = TRUE; |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
767 *empty = FALSE; |
| 1337 | 768 } |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
769 } |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
770 } |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
771 |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
772 |
|
1317
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
773 /* Check if two given patterns are dupes |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
774 */ |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
775 BOOL comparePattern(const JSSPattern *pat1, const JSSPattern *pat2) |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
776 { |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
777 return |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
778 pat1->nrows == pat2->nrows && |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
779 pat1->nchannels == pat2->nchannels && |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
780 memcmp(pat1->data, pat2->data, sizeof(JSSNote) * pat1->nrows * pat1->nchannels) == 0; |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
781 } |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
782 |
|
2772c16622bb
Add checking of duplicate patterns in the optimization pass of xm2jss. Not
Matti Hamalainen <ccr@tnsp.org>
parents:
1315
diff
changeset
|
783 |
| 0 | 784 /* Optimize a given module |
| 785 */ | |
| 786 JSSModule *optimizeModule(JSSModule *m) | |
| 787 { | |
| 788 BOOL usedPatterns[jsetMaxPatterns + 1], | |
| 789 usedInstruments[jsetMaxInstruments + 1], | |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
790 usedExtInstruments[jsetMaxInstruments + 1], |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
791 usedChannels[jsetMaxChannels]; |
| 0 | 792 int mapExtInstruments[jsetMaxInstruments + 1], |
| 793 mapInstruments[jsetMaxInstruments + 1], | |
|
1333
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
794 mapPatterns[jsetMaxPatterns + 1], |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
795 dupPatterns[jsetMaxPatterns + 1]; |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
796 |
| 0 | 797 JSSModule *r = NULL; |
| 1320 | 798 int n8, n16, nunused, ndupes; |
| 0 | 799 |
| 800 // Allocate a new module | |
| 801 if ((r = jssAllocateModule()) == NULL) | |
| 802 return NULL; | |
| 803 | |
| 804 // Copy things | |
| 805 r->moduleType = m->moduleType; | |
| 806 r->moduleName = dm_strdup(m->moduleName); | |
| 807 r->trackerName = dm_strdup(m->trackerName); | |
| 808 r->defSpeed = m->defSpeed; | |
| 809 r->defTempo = m->defTempo; | |
| 810 r->defFlags = m->defFlags; | |
| 811 r->defRestartPos = m->defRestartPos; | |
| 812 r->intVersion = m->intVersion; | |
| 813 r->nchannels = m->nchannels; | |
| 814 r->norders = m->norders; | |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
815 |
| 1320 | 816 for (int i = 0; i < jsetNChannels; i++) |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
817 { |
| 0 | 818 r->defPanning[i] = m->defPanning[i]; |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
819 usedChannels[i] = FALSE; |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
820 } |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
821 |
| 0 | 822 // Initialize values |
| 1320 | 823 for (int i = 0; i <= jsetMaxInstruments; i++) |
| 0 | 824 { |
| 825 usedExtInstruments[i] = FALSE; | |
| 798 | 826 usedInstruments[i] = FALSE; |
| 827 mapExtInstruments[i] = jsetNotSet; | |
| 828 mapInstruments[i] = jsetNotSet; | |
| 0 | 829 } |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
830 |
| 1320 | 831 for (int i = 0; i <= jsetMaxPatterns; i++) |
| 0 | 832 { |
| 833 usedPatterns[i] = FALSE; | |
| 798 | 834 mapPatterns[i] = jsetNotSet; |
|
1333
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
835 dupPatterns[i] = jsetNotSet; |
| 0 | 836 } |
| 837 | |
| 1094 | 838 // |
| 798 | 839 // Find out all actually used patterns and ext.instruments |
| 1100 | 840 // by going through all patterns specified in the order list |
| 1094 | 841 // |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
842 dmMsg(1, "Scanning patterns for used instruments and channels...\n"); |
| 1320 | 843 for (int norder = 0; norder < m->norders; norder++) |
| 0 | 844 { |
| 1320 | 845 int npat = m->orderList[norder]; |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
846 if (npat >= 0 && npat < m->npatterns) |
| 0 | 847 { |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
848 JSSPattern *pattern = m->patterns[npat]; |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
849 if (pattern != NULL) |
| 0 | 850 { |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
851 BOOL empty; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
852 |
| 1100 | 853 // Mark this pattern as used |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
854 usedPatterns[npat] = TRUE; |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
855 |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
856 // Scan for used instruments and channels |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
857 scanPattern(m, pattern, npat, usedExtInstruments, usedChannels, &empty); |
|
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
858 |
| 1249 | 859 // Empty patterns with known number of rows are "removed" |
| 860 if (empty && pattern->nrows == jsetDefaultRows) | |
| 0 | 861 { |
| 1320 | 862 m->orderList[norder] = jsetNotSet; |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
863 usedPatterns[npat] = FALSE; |
| 0 | 864 } |
| 865 } | |
| 866 else | |
| 867 { | |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
868 dmErrorMsg("Pattern 0x%x is used on order 0x%x, but has no data!\n", |
| 1320 | 869 npat, norder); |
|
807
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
870 |
|
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
871 // Fix it. |
| 1320 | 872 m->orderList[norder] = jsetNotSet; |
| 0 | 873 } |
| 874 } | |
| 875 else | |
|
1244
072851dcec5c
Improve module optimization.
Matti Hamalainen <ccr@tnsp.org>
parents:
1243
diff
changeset
|
876 if (npat != jsetNotSet) |
| 0 | 877 { |
| 1101 | 878 dmErrorMsg("Order 0x%x has invalid pattern number 0x%x, changing to empty!\n", |
| 1320 | 879 norder, npat); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
880 |
|
807
d83dc7e47076
Fix some order list and pattern handling things.
Matti Hamalainen <ccr@tnsp.org>
parents:
798
diff
changeset
|
881 // Fix it. |
| 1320 | 882 m->orderList[norder] = jsetNotSet; |
| 0 | 883 } |
| 884 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
885 |
| 1094 | 886 // |
| 1100 | 887 // Find used sample instruments |
| 1094 | 888 // |
| 1101 | 889 dmMsg(1, "Checking ext.instruments for used sample instruments...\n"); |
| 1320 | 890 for (int i = 0; i < jsetMaxInstruments; i++) |
| 0 | 891 if (usedExtInstruments[i] && m->extInstruments[i] != NULL) |
| 892 { | |
| 893 JSSExtInstrument *e = m->extInstruments[i]; | |
| 1094 | 894 |
| 1347 | 895 for (int note = 0; note < jsetNNotes; note++) |
| 0 | 896 if (e->sNumForNotes[note] != jsetNotSet) |
| 897 { | |
| 898 int q = e->sNumForNotes[note]; | |
| 899 if (q >= 0 && q < m->ninstruments) | |
| 900 { | |
| 901 usedInstruments[q] = TRUE; | |
| 902 } | |
| 903 else | |
| 904 { | |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
905 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
|
906 i + 1, m->ninstruments, q + 1); |
| 0 | 907 } |
| 908 } | |
| 909 } | |
| 1094 | 910 |
| 911 // | |
| 0 | 912 // Create pattern mappings |
| 1094 | 913 // |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
914 dmMsg(1, "Creating pattern remaps...\n"); |
| 1320 | 915 nunused = ndupes = 0; |
| 916 for (int pat1 = 0; pat1 <= jsetMaxPatterns; pat1++) | |
| 917 if (usedPatterns[pat1]) | |
| 0 | 918 { |
|
1333
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
919 // Sanity check patterns |
| 1320 | 920 if (pat1 >= m->npatterns) |
| 0 | 921 { |
| 1320 | 922 dmErrorMsg("Pattern 0x%x >= 0x%x, but used!\n", pat1, m->npatterns); |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
923 continue; |
| 0 | 924 } |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
925 |
| 1332 | 926 if (m->patterns[pat1] == NULL) |
| 0 | 927 { |
| 1320 | 928 dmErrorMsg("Pattern 0x%x used but is NULL.\n", pat1); |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
929 continue; |
| 0 | 930 } |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
931 |
|
1333
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
932 // Check for previously marked dupes |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
933 if (dupPatterns[pat1] != jsetNotSet) |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
934 { |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
935 mapPatterns[pat1] = dupPatterns[pat1]; |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
936 continue; |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
937 } |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
938 |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
939 // Check for duplicate patterns of "pat1" and mark them as such |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
940 for (int pat2 = 0; pat2 < m->npatterns; pat2++) |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
941 if (pat1 != pat2 && m->patterns[pat2] != NULL && |
|
1343
cffb1597ab06
Fix dupe pattern detection.
Matti Hamalainen <ccr@tnsp.org>
parents:
1342
diff
changeset
|
942 dupPatterns[pat2] == jsetNotSet && |
|
1333
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
943 comparePattern(m->patterns[pat1], m->patterns[pat2])) |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
944 { |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
945 dmPrint(1, " * %d and %d are dupes.\n", pat1, pat2); |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
946 dupPatterns[pat2] = pat1; |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
947 ndupes++; |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
948 } |
|
17c23f0494f5
Possibly make dupe pattern elimination work. Still needs some testing.
Matti Hamalainen <ccr@tnsp.org>
parents:
1332
diff
changeset
|
949 |
| 1320 | 950 mapPatterns[pat1] = r->npatterns; |
| 951 r->patterns[r->npatterns] = m->patterns[pat1]; | |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
952 (r->npatterns)++; |
| 0 | 953 } |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
954 else |
| 1320 | 955 if (m->patterns[pat1] != NULL) |
| 956 nunused++; | |
| 1094 | 957 |
| 1320 | 958 dmMsg(1, "%d used patterns (%d unused, %d duplicates).\n", |
| 959 r->npatterns, nunused, ndupes); | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
960 |
| 1094 | 961 // |
| 0 | 962 // Re-map instruments |
| 1094 | 963 // |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
964 dmMsg(1, "Creating sample instrument remaps...\n"); |
| 1320 | 965 nunused = n8 = n16 = 0; |
| 966 for (int i = 0; i < jsetMaxInstruments; i++) | |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
967 if (usedInstruments[i]) |
| 0 | 968 { |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
969 JSSInstrument *ip; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
970 if (optStripInstr) |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
971 continue; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
972 |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
973 if (i >= m->ninstruments) |
| 0 | 974 { |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
975 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
|
976 i + 1, m->ninstruments); |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
977 continue; |
| 0 | 978 } |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
979 |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
980 if ((ip = m->instruments[i]) == NULL) |
| 0 | 981 { |
|
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
982 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
|
983 continue; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
984 } |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
985 |
|
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
986 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
|
987 |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
988 mapInstruments[i] = r->ninstruments; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
989 r->instruments[r->ninstruments] = ip; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
990 (r->ninstruments)++; |
| 0 | 991 |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
992 if (ip->flags & jsf16bit) |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
993 n16++; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
994 else |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
995 n8++; |
| 0 | 996 } |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
997 else |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
998 if (m->instruments[i] != NULL) |
| 1320 | 999 nunused++; |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1000 |
| 0 | 1001 dmPrint(2, "\n"); |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1002 dmMsg(1, "Total of %d [16-bit] + %d [8-bit] samples = %d instruments (%d unused).\n", |
| 1320 | 1003 n16, n8, r->ninstruments, nunused); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1004 |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1005 // |
| 0 | 1006 // Re-map ext.instruments |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1007 // |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1008 dmMsg(1, "Creating ext.instrument remaps...\n"); |
| 1320 | 1009 nunused = 0; |
| 1010 for (int i = 0; i < jsetMaxInstruments; i++) | |
| 0 | 1011 if (usedExtInstruments[i]) |
| 1012 { | |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1013 JSSExtInstrument *eip; |
| 1347 | 1014 |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1015 if (optStripExtInstr) |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1016 continue; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1017 |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1018 if (i >= m->nextInstruments) |
| 0 | 1019 { |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
1020 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
|
1021 i + 1, m->nextInstruments); |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1022 continue; |
| 0 | 1023 } |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1024 |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1025 if ((eip = m->extInstruments[i]) == NULL) |
| 0 | 1026 { |
|
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
1027 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
|
1028 continue; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1029 } |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1030 |
|
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
1031 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
|
1032 |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1033 mapExtInstruments[i] = r->nextInstruments; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1034 r->extInstruments[r->nextInstruments] = eip; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1035 (r->nextInstruments)++; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1036 |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1037 // Re-map sNumForNotes table for this ext.instrument |
| 1347 | 1038 for (int note = 0; note < jsetNNotes; note++) |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1039 { |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1040 int q = eip->sNumForNotes[note]; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1041 if (q != jsetNotSet) |
| 0 | 1042 { |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1043 int map; |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1044 if (q >= 0 && q < jsetMaxInstruments) |
| 0 | 1045 { |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1046 map = mapInstruments[q]; |
| 0 | 1047 } |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1048 else |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1049 { |
|
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1050 map = jsetNotSet; |
|
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
1051 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
|
1052 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
|
1053 } |
|
1111
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
1054 |
|
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
1055 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
|
1056 eip->sNumForNotes[note] = map; |
| 0 | 1057 } |
| 1058 } | |
| 1059 } | |
| 1060 else | |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1061 if (m->extInstruments[i] != NULL) |
| 1320 | 1062 nunused++; |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1063 |
| 0 | 1064 dmPrint(2, "\n"); |
|
1097
0e3cb9e61170
Code cleanup, in preparation for bug hunting.
Matti Hamalainen <ccr@tnsp.org>
parents:
1094
diff
changeset
|
1065 dmMsg(1, "%d extended instruments (%d unused).\n", |
| 1320 | 1066 r->nextInstruments, nunused); |
| 1094 | 1067 |
| 1068 // | |
|
1335
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1069 // Check for actually used channels |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1070 // XXX TODO: Actually remove the unused channels. |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1071 // |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1072 nunused = 0; |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1073 for (int i = 0; i < r->nchannels; i++) |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1074 { |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1075 if(!usedChannels[i]) |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1076 nunused++; |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1077 } |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1078 dmMsg(1, "%d channels (%d unused).\n", |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1079 r->nchannels - nunused, nunused); |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1080 |
|
caf414847662
Add informational message about used/unused channels.
Matti Hamalainen <ccr@tnsp.org>
parents:
1334
diff
changeset
|
1081 // |
| 1094 | 1082 // Remap pattern data with remapped instrument data |
| 1083 // | |
| 1320 | 1084 for (int i = 0; i < r->npatterns; i++) |
| 0 | 1085 { |
| 1086 JSSPattern *p = r->patterns[i]; | |
| 1087 JSSNote *n = p->data; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1088 |
| 1336 | 1089 for (int row = 0; row < p->nrows; row++) |
| 1090 for (int channel = 0; channel < p->nchannels; channel++, n++) | |
| 0 | 1091 { |
| 1109 | 1092 // If not stripping extended instruments, check for |
| 1093 // 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
|
1094 if (!optStripExtInstr) |
|
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
1095 { |
|
856
415cc781e127
Fix some brain farts in instrument remapping.
Matti Hamalainen <ccr@tnsp.org>
parents:
807
diff
changeset
|
1096 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
|
1097 n->instrument = mapExtInstruments[n->instrument]; |
|
202
85614db5f577
Warn about invalid instruments.
Matti Hamalainen <ccr@tnsp.org>
parents:
184
diff
changeset
|
1098 |
| 1116 | 1099 if (n->instrument != jsetNotSet && |
| 1100 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
|
1101 { |
| 1116 | 1102 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
|
1103 n->instrument + 1); |
|
f9a96fc2a932
Adjust messages to show user-visible (1 based) instrument numbers.
Matti Hamalainen <ccr@tnsp.org>
parents:
1109
diff
changeset
|
1104 } |
|
338
cd57ba1130eb
Fixes and improvements in the JMOD saving and loading.
Matti Hamalainen <ccr@tnsp.org>
parents:
337
diff
changeset
|
1105 } |
|
1342
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1106 |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1107 // Convert certain effects |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1108 char effect; |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1109 JMPGETEFFECT(effect, n->effect); |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1110 switch (effect) |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1111 { |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1112 case 'C': // Cxx = Set volume |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1113 if (n->volume == jsetNotSet) |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1114 { |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1115 n->volume = n->param; |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1116 n->effect = jsetNotSet; |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1117 n->param = jsetNotSet; |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1118 } |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1119 break; |
|
f2fd1ad84829
Constify and move effect conversion back to where it was.
Matti Hamalainen <ccr@tnsp.org>
parents:
1337
diff
changeset
|
1120 } |
| 0 | 1121 } |
| 1122 } | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1123 |
|
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1124 // |
| 0 | 1125 // Remap orders list |
|
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1126 // |
| 1318 | 1127 dmMsg(1, "Remapping orders list.\n"); |
|
1352
0ecd5accea1e
Improve verbose output cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1347
diff
changeset
|
1128 nunused = 0; |
| 1320 | 1129 for (int i = 0; i < m->norders; i++) |
| 0 | 1130 { |
| 1347 | 1131 int map = mapPatterns[m->orderList[i]]; |
| 1132 if (map != m->orderList[i]) | |
|
1352
0ecd5accea1e
Improve verbose output cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1347
diff
changeset
|
1133 { |
|
0ecd5accea1e
Improve verbose output cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1347
diff
changeset
|
1134 dmPrint(2, "%02x -> %02x : ", m->orderList[i], map); |
|
0ecd5accea1e
Improve verbose output cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1347
diff
changeset
|
1135 nunused++; |
|
0ecd5accea1e
Improve verbose output cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1347
diff
changeset
|
1136 } |
| 1347 | 1137 r->orderList[i] = map; |
| 0 | 1138 } |
|
1352
0ecd5accea1e
Improve verbose output cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1347
diff
changeset
|
1139 if (nunused) |
|
0ecd5accea1e
Improve verbose output cosmetics.
Matti Hamalainen <ccr@tnsp.org>
parents:
1347
diff
changeset
|
1140 dmPrint(2, "\n"); |
| 0 | 1141 |
| 1142 return r; | |
| 1143 } | |
| 1144 | |
| 1145 | |
| 1146 int main(int argc, char *argv[]) | |
| 1147 { | |
|
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1148 DMResource *inFile = NULL; |
|
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1149 FILE *outFile = NULL; |
| 0 | 1150 JSSModule *sm, *dm; |
| 1151 int result; | |
| 1152 | |
| 1319 | 1153 dmInitProg("xm2jss", "XM to JSSMOD converter", "0.7", NULL, NULL); |
| 0 | 1154 dmVerbosity = 0; |
| 1155 | |
| 1156 // Parse arguments | |
| 1157 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
|
1158 argHandleOpt, argHandleFile, OPTH_BAILOUT)) |
| 0 | 1159 exit(1); |
| 1160 | |
| 300 | 1161 // Check arguments |
| 1162 if (optInFilename == NULL || optOutFilename == NULL) | |
| 1163 { | |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
1164 dmErrorMsg("Input or output file not specified. Try --help.\n"); |
| 300 | 1165 return 1; |
| 1166 } | |
| 0 | 1167 |
| 1168 // Read the source file | |
|
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1169 if ((result = dmf_create_stdio(optInFilename, "rb", &inFile)) != DMERR_OK) |
| 0 | 1170 { |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
1171 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
|
1172 optInFilename, result, dmErrorStr(result)); |
| 0 | 1173 return 1; |
| 1174 } | |
| 1175 | |
| 1176 // Initialize miniJSS | |
| 1177 jssInit(); | |
| 1178 | |
| 1179 // Read file | |
| 1180 dmMsg(1, "Reading XM-format file ...\n"); | |
|
797
f066e9dccf29
Oops, fix some inverted booleans.
Matti Hamalainen <ccr@tnsp.org>
parents:
796
diff
changeset
|
1181 result = jssLoadXM(inFile, &sm, FALSE); |
|
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1182 dmf_close(inFile); |
| 0 | 1183 if (result != 0) |
| 1184 { | |
|
1195
4d27c4ec8d4d
Use %d instead of %i in formats.
Matti Hamalainen <ccr@tnsp.org>
parents:
1194
diff
changeset
|
1185 dmErrorMsg("Error while loading XM file (%d), ", result); |
| 0 | 1186 if (optIgnoreErrors) |
| 1187 fprintf(stderr, "ignoring. This may cause problems.\n"); | |
| 1188 else | |
| 1189 { | |
| 1190 fprintf(stderr, "giving up. Use --ignore if you want to try to convert anyway.\n"); | |
| 1191 return 2; | |
| 1192 } | |
| 1193 } | |
| 1194 | |
| 1195 // Check stripping settings | |
| 1196 if (optStripExtInstr) optStripInstr = TRUE; | |
| 1197 if (optStripInstr) optStripSamples = TRUE; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1198 |
| 0 | 1199 // Remove samples |
| 1200 if (optStripSamples) | |
| 1201 { | |
| 1202 int i; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1203 |
| 0 | 1204 dmMsg(1, "Stripping samples...\n"); |
| 1205 for (i = 0; i < sm->ninstruments; i++) | |
| 1206 { | |
| 1207 dmFree(sm->instruments[i]->data); | |
| 1208 sm->instruments[i]->data = NULL; | |
| 1209 } | |
| 1210 } | |
| 1211 | |
| 1212 // Remove instruments | |
| 1213 if (optStripInstr) | |
| 1214 { | |
| 1215 int i; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1216 |
| 0 | 1217 dmMsg(1, "Stripping instruments...\n"); |
| 1218 for (i = 0; i < sm->ninstruments; i++) | |
| 1219 { | |
| 1220 dmFree(sm->instruments[i]); | |
| 1221 sm->instruments[i] = NULL; | |
| 1222 } | |
| 1223 sm->ninstruments = 0; | |
| 1224 } | |
| 1225 | |
| 1226 // Remove ext.instruments | |
| 1227 if (optStripExtInstr) | |
| 1228 { | |
| 1229 int i; | |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1230 |
| 0 | 1231 dmMsg(1, "Stripping ext.instruments...\n"); |
| 1232 for (i = 0; i < sm->nextInstruments; i++) | |
| 1233 { | |
| 1234 dmFree(sm->extInstruments[i]); | |
| 1235 sm->extInstruments[i] = NULL; | |
| 1236 } | |
| 1237 sm->nextInstruments = 0; | |
| 1238 } | |
| 1109 | 1239 |
| 0 | 1240 // Run the optimization procedure |
| 1241 if (optOptimize) | |
| 1242 { | |
| 1243 dmMsg(1, "Optimizing module data...\n"); | |
| 1244 dm = optimizeModule(sm); | |
| 1245 } else | |
| 1246 dm = sm; | |
| 1247 | |
| 1248 // Write output file | |
|
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1249 if ((outFile = fopen(optOutFilename, "wb")) == NULL) |
| 0 | 1250 { |
|
1431
ed04fb6da07c
Get rid of direct 'errno' usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
1352
diff
changeset
|
1251 int err = dmGetErrno(); |
|
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
860
diff
changeset
|
1252 dmErrorMsg("Error creating output file '%s', %d: %s\n", |
|
1431
ed04fb6da07c
Get rid of direct 'errno' usage.
Matti Hamalainen <ccr@tnsp.org>
parents:
1352
diff
changeset
|
1253 optOutFilename, err, dmErrorStr(err)); |
| 0 | 1254 return 1; |
| 1255 } | |
| 1256 | |
|
9
c42ee907de9c
Various improvements in xm2jss output.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1257 dmMsg(1, "Writing JSSMOD-format file [patMode=0x%04x, samp8=0x%02x, samp16=0x%02x]\n", |
| 0 | 1258 optPatternMode, optSampMode8, optSampMode16); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1259 |
|
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1260 result = jssSaveJSSMOD(outFile, dm, optPatternMode, optSampMode8, optSampMode16); |
|
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1261 |
|
1114
7aaab1533c90
Free the source module data at end.
Matti Hamalainen <ccr@tnsp.org>
parents:
1113
diff
changeset
|
1262 dmFree(sm); |
|
7aaab1533c90
Free the source module data at end.
Matti Hamalainen <ccr@tnsp.org>
parents:
1113
diff
changeset
|
1263 |
|
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
652
diff
changeset
|
1264 fclose(outFile); |
|
1235
5b8245e5f785
Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1233
diff
changeset
|
1265 |
| 0 | 1266 if (result != 0) |
| 1267 { | |
|
1113
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1268 dmErrorMsg( |
|
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1269 "Error while saving JSSMOD file, %d: %s\n" |
|
28dcf10fb8a9
Comments, cosmetics, combine one error message.
Matti Hamalainen <ccr@tnsp.org>
parents:
1111
diff
changeset
|
1270 "WARNING: The resulting file may be broken!\n", |
| 300 | 1271 result, dmErrorStr(result)); |
| 0 | 1272 } |
| 300 | 1273 else |
| 1274 { | |
| 1275 dmMsg(1, "Conversion complete.\n"); | |
| 1276 } | |
| 0 | 1277 return 0; |
| 1278 } |