dmlib: minijss/jssmod.c annotate

annotate minijss/jssmod.c @ 1972:cedb5ca1533b

Clean up the sample conversion code a bit. Improve error handling in xm2jss.

author	Matti Hamalainen <ccr@tnsp.org>
date	Sat, 30 Jun 2018 18:44:59 +0300
parents	6aa0897265e8
children	f60b4bacf6bf

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
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	41 while (count--)
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	42 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	44 Sint8 t = data[offs];
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	45
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	47 t ^= 0x80;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	48
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	50 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	51 int n = t - value;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52 value = t;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 t = n;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	55
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	56 data[offs] = t;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	59 return TRUE;
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 /* Decodes a given 16-bit sample
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 */
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	65 int jssEncodeSample16(Uint16 * data, const size_t len, const int ops)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 // "Split" the 16-bit samples into 8-bit halves
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	68 if (ops & jsampSplit)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	70 // Allocate temporary processing buffer
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 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	72 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	73 Sint16 *tmpBuf;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	74
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	75 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	76 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	77
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	78 bp1 = (Uint8 *) data;
048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	79 bp2 = bp1 + len;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	81 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	83 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	84 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	85 bp2[offs] = t & 0xff;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	87
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	88 memcpy(data, tmpBuf, bufSize);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89 dmFree(tmpBuf);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	90
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	91 return jssEncodeSample8((Uint8 *) data, bufSize, ops);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	92 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	93 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	95 Sint16 value = 0, sdata = (Sint16 ) data;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	96
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	97 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	98 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	99 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	100
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 if (ops & jsampSwapEndianess)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	103 const Sint16 p = sdata[offs];
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	104 t = ((p >> 8) & 0xff) \| ((p & 0xff) << 8);
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	105 }
b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	106 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	107 t = sdata[offs];
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	108
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	111 const int n = t - value;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	112 value = t;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 t = n;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	114 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	115
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	116 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	117 t ^= 0x8000;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	118
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	119 sdata[offs] = t;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	120 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	121 }
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	122
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	123 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	124 }
44 064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	125
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	126 #endif
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	129 /* Decodes a given 8-bit sample
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	130 */
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	131 int jssDecodeSample8(Uint8 * data, const size_t len, const int ops)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	132 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	133 Sint8 value = 0;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	134
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	135 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	136 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	137 Sint8 t = data[offs];
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	138
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	139 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	140 t = value = t + value;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	141
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	142 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	143 t ^= 0x80;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	144
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	145 data[offs] = t;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	146 }
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	147
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	148 return DMERR_OK;
0 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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	152 /* Decodes a given 16-bit sample
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	153 */
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	154 int jssDecodeSample16(Uint16 * data, const size_t len, const int ops)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	155 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	156 if (ops & jsampSplit)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	157 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	158 size_t bufSize = len * sizeof(Uint16);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	159 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	160 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	161 int ret;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	162
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	163 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	164 return ret;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	165
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	166 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	167 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	168
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	169 // Copy original data to temporary buffer
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	170 memcpy(tmpBuf, data, bufSize);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	171
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	172 bp1 = (Uint8 *) tmpBuf;
43 048536ad01e0 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	173 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	174
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	175 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	177 data[offs] = (bp1[offs] << 8) \| (bp2[offs] & 0xff);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	179
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 dmFree(tmpBuf);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	181 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	182 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	184 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	185
cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	186 for (size_t offs = 0; offs < len; offs++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	188 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	189
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 if (ops & jsampSwapEndianess)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	192 const Sint16 p = sdata[offs];
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 t = ((p >> 8) & 0xff) \| ((p & 0xff) << 8);
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	194 }
b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	195 else
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	196 t = *sdata;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	197
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	198 if (ops & jsampDelta)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	199 t = value = t + value;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	200
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	201 if (ops & jsampFlipSign)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	202 t ^= 0x8000;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	203
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	204 sdata[offs] = t;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	205 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206 }
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	207
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	208 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	209 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	210
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	211
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	212 /* 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	213 */
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	214 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	215 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	216 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	217 Sint16 *out;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	218
1129 e466d10dae6d Change API of jssDecodeSample{8,16}() functions to return dmlib error codes Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	219 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	220 return DMERR_MALLOC;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	221
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	222 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	223 {
1972 cedb5ca1533b Clean up the sample conversion code a bit. Improve error handling in xm2jss. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	224 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	225 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	226
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	227 return DMERR_OK;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	228 }
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	229
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	230
49 033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	231 /* 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	232 * 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	233 *
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	234 * 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	235 * 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	236 */
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	237 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	238 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	239 if (module == NULL)
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	240 return DMERR_NULLPTR;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	241
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	242 // Convert instruments
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	243 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	244 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	245 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	246 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	247 {
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	248 int res;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	249 void *data = NULL;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	250
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	251 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	252 continue;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	253
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	254 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	255 return res;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	256
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	257 inst->flags \|= jsf16bit;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	258 dmFree(inst->data);
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	259 inst->data = data;
033c660c25f5 Restructure module playing, removing 8bit sample mixing (output can still be Matti Hamalainen <ccr@tnsp.org> parents: 44 diff changeset	260 }
44 064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	261 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	262
44 064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	263 return DMERR_OK;
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
064d1d1d5b0f Add new functions, jssConvertSampleFromFP() and jssConvertSampleToFP(). Matti Hamalainen <ccr@tnsp.org> parents: 43 diff changeset	266
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 /* Allocates a new module structure or returns errorvalue if failed.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 * Memory is allocated only for the basic structure. Sample- and pattern
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	269 * areas must be allocated separately with appropriate routines.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	270 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	271 JSSModule *jssAllocateModule(void)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	273 JSSModule *module;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	274
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 // Allocate module structure
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276 module = dmMalloc0(sizeof(JSSModule));
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277 if (module == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	280 // Initialize structure
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	281 for (int i = 0; i < jsetNChannels; i++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	282 module->defPanning[i] = jchPanMiddle;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	283
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	284 for (int i = 0; i < jsetMaxOrders; i++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	285 module->orderList[i] = jsetOrderEnd;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	286
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 // Allocate mutex
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 #ifdef JSS_SUP_THREADS
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	289 module->mutex = dmCreateMutex();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	290 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	291
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	292 return module;
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	296 /* Frees a given module structure, freeing all memory areas
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	297 * that were allocated for it (including patterns, samples, etc.)
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 int jssFreeModule(JSSModule * module)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	300 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 if (module == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 return DMERR_NULLPTR;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	303
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 // Free strings
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305 #ifndef JSS_LIGHT
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 dmFree(module->moduleName);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	307 dmFree(module->trackerName);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	308 #endif
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	309
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	310 // Free patterns
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	311 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	312 jssFreePattern(module->patterns[i]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313
286 a17e54015bd9 Fix a small memory leak, the special "empty" pattern was not being freed. Matti Hamalainen <ccr@tnsp.org> parents: 56 diff changeset	314 // 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	315 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	316
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	317 // Free instruments
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	318 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	319 jssFreeInstrument(module->instruments[i]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	320
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321 // Free extended instruments
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	322 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	323 jssFreeExtInstrument(module->extInstruments[i]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	324
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 // Free mutex
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 #ifdef JSS_SUP_THREADS
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 dmDestroyMutex(module->mutex);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328 #endif
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	329
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 // Free the module structure
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1163 diff changeset	331 dmMemset(module, 0, sizeof(JSSModule));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	332 dmFree(module);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	333
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	334 return DMERR_OK;
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	338 /* Allocates and initializes a internal pattern structure.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 */
743 b136ddc4070b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	340 JSSPattern *jssAllocatePattern(const int nrows, const int nchannels)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341 {
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	342 JSSPattern *pattern;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 JSSNote *pnote;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	344
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	345 // Check arguments
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346 if (nrows <= 0 \|\| nchannels <= 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	347 JSSERROR(DMERR_INVALID_ARGS, NULL, "Invalid nrows=%i or nchannels=%i.\n", nrows, nchannels);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 // Allocate a pattern structure
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	350 if ((pattern = dmMalloc0(sizeof(JSSPattern))) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 JSSERROR(DMERR_MALLOC, NULL, "Could not allocate pattern structure.\n");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	352
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	353 // Allocate notedata
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1227 diff changeset	354 pattern->data = dmMalloc(nrows * nchannels * sizeof(JSSNote));
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	355 if (pattern->data == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 {
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	357 dmFree(pattern);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358 JSSERROR(DMERR_MALLOC, NULL, "Could not allocate pattern data (nrows=%i, nchannels=%i).\n", nrows,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 nchannels);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361
1238 e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1227 diff changeset	362 // Initialize structure
e8c99da451cd Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 1227 diff changeset	363 pattern->nrows = nrows;
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	364 pattern->nchannels = 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
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	376 return pattern;
823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	377 }
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	378
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	379
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	380 void jssFreePattern(JSSPattern *pattern)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	381 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	382 if (pattern != NULL)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	383 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	384 dmFree(pattern->data);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	385 dmFree(pattern);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	386 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	387 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	388
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	389
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 /* Allocates and initializes internal "normal" instrument structure.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	391 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	392 JSSInstrument *jssAllocateInstrument(void)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 {
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	394 JSSInstrument *inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 // Allocate a instrument structure
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	397 if ((inst = dmMalloc0(sizeof(JSSInstrument))) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	400 return inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	401 }
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
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	404 void jssFreeInstrument(JSSInstrument *inst)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	405 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	406 if (inst != NULL)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	407 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	408 #ifndef JSS_LIGHT
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	409 dmFree(inst->desc);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	410 #endif
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	411 dmFree(inst->data);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	412 dmFree(inst);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	413 }
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	414 }
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	415
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	416
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	417 /* Allocates and initializes "extended" instrument structure.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	418 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 JSSExtInstrument *jssAllocateExtInstrument(void)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	420 {
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	421 JSSExtInstrument *inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 // Allocate a instrument structure
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	424 if ((inst = dmMalloc0(sizeof(JSSExtInstrument))) == NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425 return NULL;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	426
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	427 // Initialize the requisite fields
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1402 diff changeset	428 for (int i = 0; i < jsetNNotes; i++)
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	429 inst->sNumForNotes[i] = jsetNotSet;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 948 diff changeset	430
1222 823f8e06ff6a Rename some variables. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	431 return inst;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	432 }
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	433
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	434
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	435 void jssFreeExtInstrument(JSSExtInstrument *inst)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	436 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	437 if (inst != NULL)
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	438 {
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	439 #ifndef JSS_LIGHT
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	440 dmFree(inst->desc);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	441 #endif
1402 b47109fce375 Make JSSExtInstrument.instConvSamples dynamically allocated and add check Matti Hamalainen <ccr@tnsp.org> parents: 1401 diff changeset	442 dmFree(inst->instConvTable);
1224 e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	443 dmFree(inst);
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	444 }
e667710aee8e Add functions jssFreeInstrument(), jssFreeExtInstrument() and jssFreePattern(). Matti Hamalainen <ccr@tnsp.org> parents: 1222 diff changeset	445 }

Mercurial > hg > dmlib

annotate minijss/jssmod.c @ 1972:cedb5ca1533b