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