dmlib: minijss/jssmod.c annotate

annotate minijss/jssmod.c @ 2278:40ccc09f09be

Implement empty channel removal in xm2jss and make JSSMOD format support channel remapping for this.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 18 Jun 2019 12:12:51 +0300
parents	2f8506171064
children	fc58f62f100c

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 * miniJSS - Module structure and handling routines
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	3 * Programmed and designed by Matti 'ccr' Hamalainen
1163 aa3738b121d1 Bump copyright years. Matti Hamalainen <ccr@tnsp.org> parents: 1129 diff changeset	4 * (C) Copyright 2006-2015 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 #include "jssmod.h"
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	8
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	9 #ifndef JSS_LIGHT
948 698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	10
698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	11 /* Take given data until maxlen reached, make a string.
698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	12 * Basically a bit like strndup(), except end marker byte
698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	13 * can be specified.
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	14 */
948 698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	15 char jssASCIItoStr(const char src, const char endByte, const size_t len)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	16 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	17 size_t i, k;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	18 char *res;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19
1401 aaed8fa9a11f Fix jssASCIItoStr() bounds check. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	20 for (i = 0; src[i] != endByte && i < len; )
aaed8fa9a11f Fix jssASCIItoStr() bounds check. Matti Hamalainen <ccr@tnsp.org> parents: 1238 diff changeset	21 i++;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	22
948 698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	23 if ((res = dmMalloc(i + 1)) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25
948 698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	26 for (k = 0; src[k] != endByte && k < i; k++)
698ee83bac98 Constify & cleanup. Matti Hamalainen <ccr@tnsp.org> parents: 743 diff changeset	27 res[k] = src[k];
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 res[k] = 0;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31 return res;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	33
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	34
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	35 /* Encodes a given 8-bit sample
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 */
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	37 int jssEncodeSample8(Uint8 * data, const size_t len, const int ops)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	39 Sint8 value = 0;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	40
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	41 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	42 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	43 Sint8 t = data[offs];
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	44
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 t ^= 0x80;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 int n = t - value;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51 value = t;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 t = n;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	54
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	55 data[offs] = t;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57
1974 f9fd6b4d29f2 Return correct value from jssEncodeSample8(). Matti Hamalainen <ccr@tnsp.org> parents: 1973 diff changeset	58 return DMERR_OK;
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 /* Decodes a given 16-bit sample
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 */
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	64 int jssEncodeSample16(Uint16 * data, const size_t len, const int ops)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 // "Split" the 16-bit samples into 8-bit halves
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 if (ops & jsampSplit)
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 // Allocate temporary processing buffer
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 Uint8 bp1, bp2;
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	71 size_t bufSize = len * sizeof(Sint16);
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	72 Sint16 *tmpBuf;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	74 if ((tmpBuf = dmMalloc(bufSize)) == NULL)
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	75 return DMERR_MALLOC;
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	76
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	77 bp1 = (Uint8 *) data;
048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	78 bp2 = bp1 + len;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	80 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	81 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	82 const Sint16 t = tmpBuf[offs];
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	83 bp1[offs] = t >> 8;
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	84 bp2[offs] = t & 0xff;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	86
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	87 memcpy(data, tmpBuf, bufSize);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 dmFree(tmpBuf);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	89
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	90 return jssEncodeSample8((Uint8 *) data, bufSize, ops);
0 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 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	94 Sint16 value = 0, sdata = (Sint16 ) data;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	95
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	96 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	98 Sint16 t;
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	99
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 if (ops & jsampSwapEndianess)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	102 const Sint16 p = sdata[offs];
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	103 t = ((p >> 8) & 0xff) \| ((p & 0xff) << 8);
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	104 }
b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	105 else
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	106 t = sdata[offs];
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	107
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	110 const int n = t - value;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111 value = t;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 t = n;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	114
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	115 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 t ^= 0x8000;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	117
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	118 sdata[offs] = t;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	119 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 }
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	121
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	122 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	123 }
44 064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	124
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	125 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	127
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	128 /* Decodes a given 8-bit sample
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 */
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	130 int jssDecodeSample8(Uint8 * data, const size_t len, const int ops)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	131 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	132 Sint8 value = 0;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	133
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	134 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	135 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	136 Sint8 t = data[offs];
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	137
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	138 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 t = value = t + value;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	140
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	141 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 t ^= 0x80;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	143
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	144 data[offs] = t;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	145 }
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	146
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	147 return DMERR_OK;
0 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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	150
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	151 /* Decodes a given 16-bit sample
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 */
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	153 int jssDecodeSample16(Uint16 * data, const size_t len, const int ops)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	154 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 if (ops & jsampSplit)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	157 size_t bufSize = len * sizeof(Uint16);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	158 Uint8 bp1, bp2;
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	159 Sint16 *tmpBuf;
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	160 int ret;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	161
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	162 if ((ret = jssDecodeSample8((Uint8 *) data, bufSize, ops)) != DMERR_OK)
e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	163 return ret;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	164
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	165 if ((tmpBuf = dmMalloc(bufSize)) == NULL)
e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	166 return DMERR_MALLOC;
e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	167
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	168 // Copy original data to temporary buffer
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	169 memcpy(tmpBuf, data, bufSize);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	170
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	171 bp1 = (Uint8 *) tmpBuf;
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	172 bp2 = bp1 + len;
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	173
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	174 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	175 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	176 data[offs] = (bp1[offs] << 8) \| (bp2[offs] & 0xff);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	178
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	179 dmFree(tmpBuf);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	183 Sint16 value = 0, sdata = (Sint16 ) data;
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	184
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	185 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	187 Sint16 t;
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	188
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 if (ops & jsampSwapEndianess)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	191 const Sint16 p = sdata[offs];
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 t = ((p >> 8) & 0xff) \| ((p & 0xff) << 8);
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	193 }
b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	194 else
1997 2f8506171064 Fix a stupid bug left over from the sample conversion refactor. Matti Hamalainen <ccr@tnsp.org> parents: 1974 diff changeset	195 t = sdata[offs];
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	196
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	197 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 t = value = t + value;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	199
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	200 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 t ^= 0x8000;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	202
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	203 sdata[offs] = t;
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 }
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	206
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	207 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	210
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	211 /* Convert sample data from U8 to S16
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	212 */
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	213 int jssConvertSampleTo16(void *dst, void src, const size_t len)
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	214 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	215 Uint8 in = (Uint8 ) src;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	216 Sint16 *out;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	217
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	218 if ((dst = out = dmMalloc(sizeof(Sint16) len)) == NULL)
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	219 return DMERR_MALLOC;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	220
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	221 for (size_t offs = 0; offs < len; offs++)
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	222 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	223 out[offs] = (in[offs] * 256) - 32768;
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	224 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	225
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	226 return DMERR_OK;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	227 }
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	228
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	229
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	230 /* Converts the given module in preparation for playing it.
56 8725853609db Remove the floating point mixing .. it wasn't so good idea after all. Matti Hamalainen <ccr@tnsp.org> parents: 51 diff changeset	231 * This involves sample format conversion (8 to 16 bit, etc.)
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	232 *
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	233 * NOTICE! The converted module can only be saved in JSSMOD
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	234 * format, but this is not recommended.
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	235 */
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	236 int jssConvertModuleForPlaying(JSSModule *module)
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	237 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	238 if (module == NULL)
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	239 return DMERR_NULLPTR;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	240
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	241 // Convert instruments
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	242 for (int i = 0; i < module->ninstruments; i++)
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	243 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	244 JSSInstrument *inst = module->instruments[i];
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	245 if (inst != NULL && inst->data != NULL)
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	246 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	247 int res;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	248 void *data = NULL;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	249
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	250 if (inst->flags & jsf16bit)
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	251 continue;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	252
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	253 if ((res = jssConvertSampleTo16(&data, inst->data, inst->size)) != DMERR_OK)
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	254 return res;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	255
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	256 inst->flags \|= jsf16bit;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	257 dmFree(inst->data);
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	258 inst->data = data;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	259 }
44 064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	260 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	261
44 064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	262 return DMERR_OK;
064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	263 }
064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	264
064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	265
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 /* Allocates a new module structure or returns errorvalue if failed.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 * Memory is allocated only for the basic structure. Sample- and pattern
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 * areas must be allocated separately with appropriate routines.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 JSSModule *jssAllocateModule(void)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272 JSSModule *module;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274 // Allocate module structure
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 module = dmMalloc0(sizeof(JSSModule));
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276 if (module == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279 // Initialize structure
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	280 for (int i = 0; i < jsetNChannels; i++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	281 module->defPanning[i] = jchPanMiddle;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	283 for (int i = 0; i < jsetMaxOrders; i++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 module->orderList[i] = jsetOrderEnd;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286 // Allocate mutex
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 #ifdef JSS_SUP_THREADS
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 module->mutex = dmCreateMutex();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291 return module;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	293
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	294
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	295 /* Frees a given module structure, freeing all memory areas
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 * that were allocated for it (including patterns, samples, etc.)
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 int jssFreeModule(JSSModule * module)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	299 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 if (module == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 return DMERR_NULLPTR;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	302
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 // Free strings
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 #ifndef JSS_LIGHT
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 dmFree(module->moduleName);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 dmFree(module->trackerName);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309 // Free patterns
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	310 for (int i = 0; i < module->npatterns; i++)
1227 a4a9ce298cdd Simplify jssFreeModule() by using jssFree() functions for freeing parts of Matti Hamalainen <ccr@tnsp.org>* parents: 1224 diff changeset	311 jssFreePattern(module->patterns[i]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	312
286 a17e54015bd9 Fix a small memory leak, the special "empty" pattern was not being freed. Matti Hamalainen <ccr@tnsp.org> parents: 56 diff changeset	313 // Free the "empty" pattern
1227 a4a9ce298cdd Simplify jssFreeModule() by using jssFree() functions for freeing parts of Matti Hamalainen <ccr@tnsp.org>* parents: 1224 diff changeset	314 jssFreePattern(module->patterns[jsetMaxPatterns]);
286 a17e54015bd9 Fix a small memory leak, the special "empty" pattern was not being freed. Matti Hamalainen <ccr@tnsp.org> parents: 56 diff changeset	315
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	316 // Free instruments
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	317 for (int i = 0; i < module->ninstruments; i++)
1227 a4a9ce298cdd Simplify jssFreeModule() by using jssFree() functions for freeing parts of Matti Hamalainen <ccr@tnsp.org>* parents: 1224 diff changeset	318 jssFreeInstrument(module->instruments[i]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	319
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320 // Free extended instruments
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	321 for (int i = 0; i < module->nextInstruments; i++)
1227 a4a9ce298cdd Simplify jssFreeModule() by using jssFree() functions for freeing parts of Matti Hamalainen <ccr@tnsp.org>* parents: 1224 diff changeset	322 jssFreeExtInstrument(module->extInstruments[i]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324 // Free mutex
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 #ifdef JSS_SUP_THREADS
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 dmDestroyMutex(module->mutex);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 #endif
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	328
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329 // Free the module structure
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1163 diff changeset	330 dmMemset(module, 0, sizeof(JSSModule));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331 dmFree(module);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332
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 /* Allocates and initializes a internal pattern structure.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 */
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	339 JSSPattern *jssAllocatePattern(const int nrows, const int nchannels)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 {
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	341 JSSPattern *pattern;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342 JSSNote *pnote;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344 // Check arguments
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 if (nrows <= 0 \|\| nchannels <= 0)
2278 40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	346 JSSERROR(DMERR_INVALID_ARGS, NULL, "Invalid nrows=%d or nchannels=%d.\n", nrows, nchannels);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 // Allocate a pattern structure
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	349 if ((pattern = dmMalloc0(sizeof(JSSPattern))) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	350 JSSERROR(DMERR_MALLOC, NULL, "Could not allocate pattern structure.\n");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352 // Allocate notedata
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1227 diff changeset	353 pattern->data = dmMalloc(nrows * nchannels * sizeof(JSSNote));
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	354 if (pattern->data == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 {
2278 40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	356 jssFreePattern(pattern);
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	357 JSSERROR(DMERR_MALLOC, NULL, "Could not allocate pattern data (nrows=%d, nchannels=%d).\n",
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	358 nrows, nchannels);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1227 diff changeset	361 // Initialize structure
e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1227 diff changeset	362 pattern->nrows = nrows;
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	363 pattern->nchannels = nchannels;
2278 40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	364 pattern->nmap = nchannels;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	366 pnote = pattern->data;
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	367 for (int row = 0; row < nrows; row++)
6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	368 for (int chn = 0; chn < nchannels; chn++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 {
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	370 pnote->note = pnote->instrument = pnote->volume =
6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	371 pnote->effect = pnote->param = jsetNotSet;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	373 pnote++;
0 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
2278 40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	376 // Initialize pattern channel map
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	377 pattern->map = dmMalloc(nchannels * sizeof(pattern->map[0]));
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	378 pattern->used = dmMalloc(nchannels * sizeof(pattern->used[0]));
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	379 if (pattern->map == NULL \|\| pattern->used == NULL)
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	380 {
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	381 jssFreePattern(pattern);
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	382 JSSERROR(DMERR_MALLOC, NULL, "Could not allocate pattern map (nchannels=%d).\n",
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	383 nchannels);
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	384 }
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	385
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	386 for (int chn = 0; chn < nchannels; chn++)
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	387 pattern->map[chn] = chn;
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	388
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	389 return pattern;
823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	390 }
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	391
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	392
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	393 void jssFreePattern(JSSPattern *pattern)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	394 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	395 if (pattern != NULL)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	396 {
2278 40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	397 dmFree(pattern->used);
40ccc09f09be Implement empty channel removal in xm2jss and make JSSMOD format support Matti Hamalainen <ccr@tnsp.org> parents: 1997 diff changeset	398 dmFree(pattern->map);
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	399 dmFree(pattern->data);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	400 dmFree(pattern);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	401 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	402 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	404
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	405 /* Allocates and initializes internal "normal" instrument structure.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	406 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	407 JSSInstrument *jssAllocateInstrument(void)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 {
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	409 JSSInstrument *inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	410
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	411 // Allocate a instrument structure
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	412 if ((inst = dmMalloc0(sizeof(JSSInstrument))) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	415 return inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	416 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	419 void jssFreeInstrument(JSSInstrument *inst)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	420 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	421 if (inst != NULL)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	422 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	423 #ifndef JSS_LIGHT
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	424 dmFree(inst->desc);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	425 #endif
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	426 dmFree(inst->data);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	427 dmFree(inst);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	428 }
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	429 }
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	430
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	431
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 /* Allocates and initializes "extended" instrument structure.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	433 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	434 JSSExtInstrument *jssAllocateExtInstrument(void)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 {
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	436 JSSExtInstrument *inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	437
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438 // Allocate a instrument structure
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	439 if ((inst = dmMalloc0(sizeof(JSSExtInstrument))) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	440 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	442 // Initialize the requisite fields
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	443 for (int i = 0; i < jsetNNotes; i++)
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	444 inst->sNumForNotes[i] = jsetNotSet;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	445
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	446 return inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447 }
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	448
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	449
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	450 void jssFreeExtInstrument(JSSExtInstrument *inst)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	451 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	452 if (inst != NULL)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	453 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	454 #ifndef JSS_LIGHT
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	455 dmFree(inst->desc);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	456 #endif
1402 b47109fce375 Make JSSExtInstrument.instConvSamples dynamically allocated and add check Matti Hamalainen <ccr@tnsp.org> parents: 1401 diff changeset	457 dmFree(inst->instConvTable);
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	458 dmFree(inst);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	459 }
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	460 }

Mercurial > hg > dmlib

annotate minijss/jssmod.c @ 2278:40ccc09f09be