dmlib: tools/xm2jss.c annotate

annotate tools/xm2jss.c @ 2298:b5abfff07ca9

Add new DMGrowBuf helper functions dmGrowBufCopyOffsSize() and dmGrowBufConstCopyOffsSize().

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 04 Jul 2019 10:54:16 +0300
parents	6c3c3355007d
children	dcf1016f3d27

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

Mercurial > hg > dmlib

annotate tools/xm2jss.c @ 2298:b5abfff07ca9