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