dmlib: minijss/jssplr.c annotate

annotate minijss/jssplr.c @ 2298:b5abfff07ca9

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

author	Matti Hamalainen <ccr@tnsp.org>
date	Thu, 04 Jul 2019 10:54:16 +0300
parents	3b71aa1ef915
children	69a5af2eb1ea

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 playing 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: 1134 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 "jssplr.h"
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	7
779 954b1b392c8b Restore old note frequency calculation for now. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	8 #include <math.h>
954b1b392c8b Restore old note frequency calculation for now. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	9
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	10 /* Miscellaneous tables
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	11 */
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	12 static const Uint8 jmpSineTab[32] =
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	13 {
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	14 0, 24, 49, 74, 97, 120, 141, 161,
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	15 180, 197, 212, 224, 235, 244, 250, 253,
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	16 255, 253, 250, 244, 235, 224, 212, 197,
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	17 180, 161, 141, 120, 97, 74, 49, 24
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	18 };
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	19
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	20
1422 3b71aa1ef915 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	21 static const Sint16 jmpXMAmigaPeriodTab[13 * 8] =
3b71aa1ef915 Cosmetic. Matti Hamalainen <ccr@tnsp.org> parents: 1403 diff changeset	22 {
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	23 907, 900, 894, 887, 881, 875, 868, 862, 856, 850, 844, 838,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	24 832, 826, 820, 814, 808, 802, 796, 791, 785, 779, 774, 768,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	25 762, 757, 752, 746, 741, 736, 730, 725, 720, 715, 709, 704,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	26 699, 694, 689, 684, 678, 675, 670, 665, 660, 655, 651, 646,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	27 640, 636, 632, 628, 623, 619, 614, 610, 604, 601, 597, 592,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	28 588, 584, 580, 575, 570, 567, 563, 559, 555, 551, 547, 543,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	29 538, 535, 532, 528, 524, 520, 516, 513, 508, 505, 502, 498,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	30 494, 491, 487, 484, 480, 477, 474, 470, 467, 463, 460, 457,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	31
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	32 453, 450, 447, 443, 440, 437, 434, 431
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	36 #define jmpNMODEffectTable (36)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	37 static const char jmpMODEffectTable[jmpNMODEffectTable] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	38
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	39
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	40 /* Helper functions
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	41 */
136 8ac24d753304 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	42 static int jmpNoteToAmigaPeriod(int note, int finetune)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	43 {
154 969cefb2f8c3 Use dmClamp(). Matti Hamalainen <ccr@tnsp.org> parents: 146 diff changeset	44 int tmp = dmClamp(note + finetune + 8, 0, 103);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	45 return jmpXMAmigaPeriodTab[tmp];
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	46 }
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	49 static int jmpGetPeriodFromNote(JSSPlayer *mp, int note, int finetune)
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 res;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	52
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	53 if (JMPGETMODFLAGS(mp, jmdfAmigaPeriods))
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	54 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	55 int mfinetune = finetune / 16,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	56 mnote = (note % 12) * 8,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	57 moctave = note / 12,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	58 period1, period2;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	59
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	60 period1 = jmpNoteToAmigaPeriod(mnote, mfinetune);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	61
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	62 if (finetune < 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	63 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	64 mfinetune--;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	65 finetune = -finetune;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	66 } else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	67 mfinetune++;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	68
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	69 period2 = jmpNoteToAmigaPeriod(mnote, mfinetune);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	70
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	71 mfinetune = finetune & 15;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	72 period1 *= (16 - mfinetune);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	73 period2 *= mfinetune;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	74
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	75 res = ((period1 + period2) * 2) >> moctave;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	76
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	77 //fprintf(stderr, "jmpGetAmigaPeriod(%d, %d) = %d\n", note, finetune, res);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	78 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	79 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	80 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	81 //fprintf(stderr, "jmpGetLinearPeriod(%d, %d) = %d\n", note, finetune, res);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	82 //res = ((120 - note) << 6) - (finetune / 2);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	83 res = 7680 - (note * 64) - (finetune / 2);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	84 if (res < 1) res = 1;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	85 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	86
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	87 return res;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	88 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	89
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	90
193 b778cc2fe7c8 Create a separate new frequency flag (vs. new pitch), for future changes. Matti Hamalainen <ccr@tnsp.org> parents: 189 diff changeset	91 static void jmpCSetPitch(JSSPlayer mp, JSSPlayerChannel chn, int value)
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 if (value > 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	94 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	95 if (JMPGETMODFLAGS(mp, jmdfAmigaPeriods))
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	96 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	97 // Frequency = 8363*1712 / Period
193 b778cc2fe7c8 Create a separate new frequency flag (vs. new pitch), for future changes. Matti Hamalainen <ccr@tnsp.org> parents: 189 diff changeset	98 chn->cfreq = chn->freq = 14317456 / value;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	99 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	100 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	101 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	102 // Frequency = Frequency = 83632^((612164 - Period) / (12164))
779 954b1b392c8b Restore old note frequency calculation for now. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	103 chn->cfreq = chn->freq = 8363.0f * pow(2.0f, (4608.0f - (double) value) / 768.0f);
954b1b392c8b Restore old note frequency calculation for now. Matti Hamalainen <ccr@tnsp.org> parents: 776 diff changeset	104 //chn->cfreq = chn->freq = 8363 * (1 << ((4608 - value) / 768));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	105 }
218 c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	106
c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	107 JMPSETNDFLAGS(cdfNewFreq);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	108 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	109 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	110
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	111
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	112 static void jmpCSetVolume(JSSPlayerChannel *chn, int channel, int volume)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	113 {
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	114 (void) channel;
157 4727db27e85d Remove dead code. Matti Hamalainen <ccr@tnsp.org> parents: 155 diff changeset	115
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	116 chn->volume = dmClamp(volume, mpMinVol, mpMaxVol);
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	117 JMPSETNDFLAGS(cdfNewVolume);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	118 }
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
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	121 static BOOL jmpExecEnvelope(JSSEnvelope env, JSSPlayerEnvelope pe, BOOL keyOff)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	122 {
220 b0407a4c0a11 Simplify frame finding in envelope update function. Matti Hamalainen <ccr@tnsp.org> parents: 219 diff changeset	123 int point;
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	124
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	125 if (!pe->exec)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	126 return FALSE;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	127
189 06da4e365dc9 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	128 // Find current point, if not last point
220 b0407a4c0a11 Simplify frame finding in envelope update function. Matti Hamalainen <ccr@tnsp.org> parents: 219 diff changeset	129 for (point = 0; point < env->npoints - 1; point++)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	130 {
220 b0407a4c0a11 Simplify frame finding in envelope update function. Matti Hamalainen <ccr@tnsp.org> parents: 219 diff changeset	131 if (pe->frame < env->points[point + 1].frame)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	132 break;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	133 }
189 06da4e365dc9 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	134
219 b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	135 if (env->flags & jenvfLooped && pe->frame >= env->points[env->loopE].frame)
b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	136 {
b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	137 point = env->loopS;
b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	138 pe->frame = env->points[env->loopS].frame;
b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	139 pe->value = env->points[point].value;
b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	140 }
b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	141
189 06da4e365dc9 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	142 // Check for last point
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	143 if (pe->frame >= env->points[env->npoints - 1].frame)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	144 {
219 b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	145 point = env->npoints - 1;
b4eb9b59fef3 Fix envelope loops. Matti Hamalainen <ccr@tnsp.org> parents: 218 diff changeset	146 pe->exec = FALSE;
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	147 pe->value = env->points[point].value;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	148 }
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	149 else
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	150 {
189 06da4e365dc9 Add few comments. Matti Hamalainen <ccr@tnsp.org> parents: 188 diff changeset	151 // Linearly interpolate the value between current and next point
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	152 JSSEnvelopePoint
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	153 *ep1 = &env->points[point],
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	154 *ep2 = &env->points[point + 1];
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	155
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	156 int delta = ep2->frame - ep1->frame;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	157 if (delta > 0)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	158 pe->value = ep1->value + ((ep2->value - ep1->value) * (pe->frame - ep1->frame)) / delta;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	159 else
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	160 pe->value = ep1->value;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	161 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	162
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	163 if (pe->exec)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	164 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	165 // The frame counter IS processed even if the envelope is not!
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	166 if ((env->flags & jenvfSustain) && point == env->sustain &&
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	167 env->points[point].frame == env->points[env->sustain].frame)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	168 {
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	169 if (keyOff)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	170 pe->frame++;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	171 } else
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	172 pe->frame++;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	173 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	174
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	175 return TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	176 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	177
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	178
61 a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	179 static void jmpProcessExtInstrument(JSSPlayerChannel *chn, int channel)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	180 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	181 JSSExtInstrument *inst = chn->extInstrument;
61 a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	182 (void) channel;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	183
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	184 // Get the instrument for envelope data
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	185 if (!inst) return;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	186
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	187 // Process the autovibrato
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	188 /*
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	189 FIXME fix me FIX me!!! todo.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	190 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	191
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	192 if (inst->volumeEnv.flags & jenvfUsed)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	193 {
169 13f27b9882bc Backed out changeset 21f54947eb18. No, it isn't. :( Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	194 // Process the instrument volume fadeout
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	195 if (chn->keyOff && chn->fadeOutVol > 0 && inst->fadeOut > 0)
169 13f27b9882bc Backed out changeset 21f54947eb18. No, it isn't. :( Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	196 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	197 int tmp = chn->fadeOutVol - inst->fadeOut;
169 13f27b9882bc Backed out changeset 21f54947eb18. No, it isn't. :( Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	198 if (tmp < 0) tmp = 0;
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	199 chn->fadeOutVol = tmp;
169 13f27b9882bc Backed out changeset 21f54947eb18. No, it isn't. :( Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	200
13f27b9882bc Backed out changeset 21f54947eb18. No, it isn't. :( Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	201 JMPSETNDFLAGS(cdfNewVolume);
13f27b9882bc Backed out changeset 21f54947eb18. No, it isn't. :( Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	202 }
13f27b9882bc Backed out changeset 21f54947eb18. No, it isn't. :( Matti Hamalainen <ccr@tnsp.org> parents: 168 diff changeset	203
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	204 // Execute the volume envelope
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	205 if (jmpExecEnvelope(&inst->volumeEnv, &chn->volumeEnv, chn->keyOff))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	206 JMPSETNDFLAGS(cdfNewVolume);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	207 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	208 else
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 // If the envelope is not used, set max volume
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	211 chn->volumeEnv.value = mpMaxVol;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	212 chn->fadeOutVol = chn->keyOff ? 0 : mpMaxFadeoutVol;
174 520c18f581c7 Fix handling of fadeouts when volume envelope is not enabled. Matti Hamalainen <ccr@tnsp.org> parents: 172 diff changeset	213 JMPSETNDFLAGS(cdfNewVolume);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	214 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	215
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	216 if (inst->panningEnv.flags & jenvfUsed)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	217 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	218 // Process the panning envelope
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	219 if (jmpExecEnvelope(&inst->panningEnv, &chn->panningEnv, chn->keyOff))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	220 JMPSETNDFLAGS(cdfNewPanPos);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	221 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	222 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	223 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	224 // If the envelope is not used, set center panning
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	225 if (chn->panningEnv.value != mpPanCenter)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	226 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	227 chn->panningEnv.value = mpPanCenter;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	228 JMPSETNDFLAGS(cdfNewPanPos);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	229 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	230 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	231 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	232
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	233
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	234 /*
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	235 * The player
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	236 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	237 JSSPlayer jmpInit(JSSMixer pDevice)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	238 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	239 JSSPlayer *mp;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	240
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	241 // Allocate a player structure
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	242 mp = dmMalloc0(sizeof(JSSPlayer));
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	243 if (mp == NULL)
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	244 JSSERROR(DMERR_MALLOC, NULL, "Could not allocate memory for player structure.\n");
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	245
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	246 // Set variables
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	247 mp->device = pDevice;
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	248
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	249 #ifdef JSS_SUP_THREADS
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	250 mp->mutex = dmCreateMutex();
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	251 #endif
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	252
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	253 return mp;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	254 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	255
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	256
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	257 int jmpClose(JSSPlayer * mp)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	258 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	259 if (mp == NULL)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	260 return DMERR_NULLPTR;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	261
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	262 // Stop player
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	263 jmpStop(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	264
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	265 // Deallocate resources
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	266 #ifdef JSS_SUP_THREADS
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	267 dmDestroyMutex(mp->mutex);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	268 #endif
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 // Clear structure
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1163 diff changeset	271 dmMemset(mp, 0, sizeof(JSSPlayer));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	272 dmFree(mp);
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 return DMERR_OK;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	275 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	276
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	277
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	278 /* Reset the envelopes for given channel.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	279 */
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	280 static void jmpResetEnvelope(JSSPlayerEnvelope *env)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	281 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	282 env->frame = env->value = 0;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	283 env->exec = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	284 }
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	287 /* Clear module player structure
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	288 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	289 void jmpClearChannel(JSSPlayerChannel *chn)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	290 {
1167 848a88ce7a57 Use dmMemset(). Matti Hamalainen <ccr@tnsp.org> parents: 1163 diff changeset	291 dmMemset(chn, 0, sizeof(JSSPlayerChannel));
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	292
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	293 chn->note = jsetNotSet;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	294 chn->ninstrument = jsetNotSet;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	295 chn->nextInstrument = jsetNotSet;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	296 chn->panning = mpPanCenter;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	297 chn->panningEnv.value = mpPanCenter;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	298 }
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	299
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	300
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	301 void jmpClearPlayer(JSSPlayer * mp)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	302 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	303 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	304 JSS_LOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	305
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	306 // Initialize general variables
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	307 mp->patternDelay = 0;
170 fb95285c3ed9 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	308 mp->newRowSet = FALSE;
fb95285c3ed9 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	309 mp->newOrderSet = FALSE;
fb95285c3ed9 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	310 mp->tick = jsetNotSet;
fb95285c3ed9 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	311 mp->row = 0;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	312 mp->lastPatLoopRow = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	313
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	314 // Initialize channel data
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	315 for (int i = 0; i < jsetNChannels; i++)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	316 jmpClearChannel(&mp->channels[i]);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	317
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	318 JSS_UNLOCK(mp);
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	321
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	322 /* Set module
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	323 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	324 void jmpSetModule(JSSPlayer * mp, JSSModule * module)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	325 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	326 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	327 JSS_LOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	328
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	329 jmpStop(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	330 jmpClearPlayer(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	331
188 47c327fb321a Another cleanup, remove the "future player" data prediction hack, it is not needed. Matti Hamalainen <ccr@tnsp.org> parents: 187 diff changeset	332 mp->module = module;
0 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 JSS_UNLOCK(mp);
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 /* Stop playing
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	339 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	340 void jmpStop(JSSPlayer * mp)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	341 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	342 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	343 JSS_LOCK(mp);
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 if (mp->isPlaying)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	346 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	347 jvmRemoveCallback(mp->device);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	348 mp->isPlaying = FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	349 }
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	350
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	351 JSS_UNLOCK(mp);
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
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	354
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	355 /* Resume playing
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	356 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	357 void jmpResume(JSSPlayer * mp)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	358 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	359 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	360 JSS_LOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	361
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	362 if (!mp->isPlaying)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	363 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	364 int result = jvmSetCallback(mp->device, jmpExec, (void *) mp);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	365 if (result != DMERR_OK)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	366 JSSERROR(result,, "Could not initialize callback for player.\n");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	367
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	368 mp->isPlaying = TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	369 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	370
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	371 JSS_UNLOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	372 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	373
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 /* Sets new order using given value as reference.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	376 * Jumps over skip-points and invalid values, loops
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	377 * to first order if enabled.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	378 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	379 static void jmpSetNewOrder(JSSPlayer * mp, int order)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	380 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	381 BOOL orderOK;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	382 mp->order = jsetNotSet;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	383 orderOK = FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	384
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	385 while (!orderOK)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	386 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	387 if (order < 0 \|\| order >= mp->module->norders)
0 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 jmpStop(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	390 orderOK = TRUE;
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 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	393 {
1134 d0898867ec4c Various fixes for issues reported by clang static analyzer. Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	394 int pattern = mp->module->orderList[order];
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	395 if (pattern == jsetOrderSkip)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	396 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	397 order++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	398 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	399 else
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	400 if (pattern >= mp->module->npatterns \|\| pattern == jsetOrderEnd)
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 jmpStop(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	403 orderOK = TRUE;
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 else
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 // All OK
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	408 orderOK = TRUE;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	409 mp->pattern = mp->module->patterns[pattern];
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	410 mp->npattern = pattern;
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	411 mp->order = order;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	412 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	413 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	414 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	415 }
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 /* Set new tempo-value of the player.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	419 */
136 8ac24d753304 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	420 static void jmpSetTempo(JSSPlayer * mp, int tempo)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	421 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	422 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	423 JSS_LOCK(mp);
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	424 assert(mp->device != NULL);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	425
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	426 mp->tempo = tempo;
186 dc22e3f77c9a Fix tempo (callback frequency) calculation. Matti Hamalainen <ccr@tnsp.org> parents: 183 diff changeset	427 jvmSetCallbackFreq(mp->device, (mp->device->outFreq * 5) / (tempo * 2));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	428 JSS_UNLOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	429 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	430
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	431
136 8ac24d753304 Cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 135 diff changeset	432 static void jmpClearChannels(JSSPlayer * mp)
0 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 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	435 JSS_LOCK(mp);
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	436 assert(mp->device != NULL);
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	437 assert(mp->module != NULL);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	438
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	439 for (int i = 0; i < mp->module->nchannels; i++)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	440 jvmStop(mp->device, i);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	441
172 cfb087000db3 Clear player channel data as well in here. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	442 // Initialize channel data
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	443 for (int i = 0; i < jsetNChannels; i++)
172 cfb087000db3 Clear player channel data as well in here. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	444 jmpClearChannel(&mp->channels[i]);
cfb087000db3 Clear player channel data as well in here. Matti Hamalainen <ccr@tnsp.org> parents: 171 diff changeset	445
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	446 JSS_UNLOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	447 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	448
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	449
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	450 /* Starts playing module from a given ORDER.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	451 */
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	452 static int jmpPlayStart(JSSPlayer *mp)
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	453 {
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	454 int result;
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	455
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	456 mp->speed = mp->module->defSpeed;
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	457 jmpSetTempo(mp, mp->module->defTempo);
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	458
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	459 result = jvmSetCallback(mp->device, jmpExec, (void *) mp);
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	460 if (result != DMERR_OK)
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	461 {
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	462 JSSERROR(result, result, "Could not initialize callback for player.\n");
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	463 }
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	464
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	465 mp->isPlaying = TRUE;
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	466 return DMERR_OK;
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	467 }
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	468
879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	469
182 9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	470 int jmpChangeOrder(JSSPlayer *mp, int order)
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	471 {
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	472 assert(mp != NULL);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	473
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	474 JSS_LOCK(mp);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	475 assert(mp->module != NULL);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	476
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	477 jmpClearChannels(mp);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	478 jmpClearPlayer(mp);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	479
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	480 jmpSetNewOrder(mp, order);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	481 if (mp->order == jsetNotSet)
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	482 {
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	483 JSS_UNLOCK(mp);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	484 JSSERROR(DMERR_NOT_SUPPORTED, DMERR_NOT_SUPPORTED,
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	485 "Could not start playing from given order #%i\n", order);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	486 }
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	487
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	488 JSS_UNLOCK(mp);
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	489 return DMERR_OK;
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	490 }
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	491
9024d249e47a Add a new function jmpChangeOrder() to change orderlist position "on fly", Matti Hamalainen <ccr@tnsp.org> parents: 181 diff changeset	492
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	493 int jmpPlayOrder(JSSPlayer * mp, int order)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	494 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	495 int result;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	496 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	497
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	498 JSS_LOCK(mp);
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	499 assert(mp->module != NULL);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	500
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	501 // Stop if already playing
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	502 jmpStop(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	503 jmpClearChannels(mp);
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	504 jmpClearPlayer(mp);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	505
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	506 // Check starting order
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	507 jmpSetNewOrder(mp, order);
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	508 if (mp->order == jsetNotSet)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	509 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	510 JSS_UNLOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	511 JSSERROR(DMERR_NOT_SUPPORTED, DMERR_NOT_SUPPORTED,
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	512 "Could not start playing from given order #%i\n", order);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	513 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	514
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	515 if ((result = jmpPlayStart(mp)) != DMERR_OK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	516 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	517 JSS_UNLOCK(mp);
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	518 return result;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	519 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	520
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	521 JSS_UNLOCK(mp);
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	522 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	523 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	524
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	525
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	526 /* Play given pattern
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	527 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	528 int jmpPlayPattern(JSSPlayer * mp, int pattern)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	529 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	530 int result;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	531 assert(mp != NULL);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	532 JSS_LOCK(mp);
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	533 assert(mp->module != NULL);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	534
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	535 // Stop if already playing
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	536 jmpStop(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	537 jmpClearPlayer(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	538
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	539 mp->npattern = pattern;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	540
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	541 if ((result = jmpPlayStart(mp)) != DMERR_OK)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	542 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	543 JSS_UNLOCK(mp);
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	544 return result;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	545 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	546
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	547 JSS_UNLOCK(mp);
181 879b2488340a Clean up player logic some more. Matti Hamalainen <ccr@tnsp.org> parents: 180 diff changeset	548 return DMERR_OK;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	549 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	550
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	551
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	552 /* Set volume for given module channel.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	553 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	554 static void jmpSetVolume(JSSPlayerChannel * chn, int channel, int volume)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	555 {
61 a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	556 (void) channel;
a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	557
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	558 chn->volume = chn->cvolume = dmClamp(volume, mpMinVol, mpMaxVol);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	559 JMPSETNDFLAGS(cdfNewVolume);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	560 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	561
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	562 #define jmpChangeVolume(Q, Z, X) jmpSetVolume(Q, Z, chn->volume + (X))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	563
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	564
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	565 /* Change the pitch of given channel by ADelta.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	566 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	567 static void jmpChangePitch(JSSPlayerChannel *chn, int channel, int delta)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	568 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	569 int value;
61 a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	570 (void) channel;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	571
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	572 // Calculate new pitch and check it
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	573 value = chn->pitch + delta;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	574 if (value < 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	575 value = 0;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	576
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	577 chn->pitch = value;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	578 JMPSETNDFLAGS(cdfNewPitch);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	579 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	580
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	581
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	582 /* Do a note portamento (pitch slide) effect for given module channel.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	583 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	584 static void jmpDoPortamento(JSSPlayerChannel * chn, int channel)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	585 {
61 a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	586 (void) channel;
a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	587
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	588 // Check for zero parameter
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	589 if (chn->iLastPortaToNoteParam == 0)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	590 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	591 JMPSETNDFLAGS(cdfNewPitch);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	592 return;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	593 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	594
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	595 /* Slide the pitch of channel to the destination value
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	596 * with speed of iLastPortaToNoteParam[] * 4 and stop when it equals.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	597 */
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	598 if (chn->pitch < chn->iLastPortaToNotePitch)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	599 {
175 4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	600 // Increase pitch UP
4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	601 jmpChangePitch(chn, channel, chn->iLastPortaToNoteParam * 4);
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	602 if (chn->pitch > chn->iLastPortaToNotePitch)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	603 chn->pitch = chn->iLastPortaToNotePitch;
175 4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	604 }
4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	605 else
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	606 if (chn->pitch > chn->iLastPortaToNotePitch)
175 4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	607 {
4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	608 // Decrease pitch DOWN
4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	609 jmpChangePitch(chn, channel, -(chn->iLastPortaToNoteParam * 4));
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	610 if (chn->pitch < chn->iLastPortaToNotePitch)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	611 chn->pitch = chn->iLastPortaToNotePitch;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	612 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	613 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	614
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	615
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	616 /* Do a tremolo effect for given module channel.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	617 */
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	618 static void jmpDoTremolo(JSSPlayerChannel *chn, int channel)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	619 {
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	620 (void) channel;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	621
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	622 if (chn->tremolo.depth != 0 && chn->tremolo.speed != 0)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	623 {
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	624 int delta, tmp = chn->tremolo.pos & 31;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	625
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	626 switch (chn->tremolo.wc & 3)
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	627 {
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	628 case 0:
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	629 delta = jmpSineTab[tmp];
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	630 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	631 case 1:
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	632 tmp <<= 3;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	633 delta = (chn->tremolo.pos < 0) ? 255 - tmp : tmp;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	634 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	635 case 2:
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	636 delta = 255;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	637 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	638 case 3:
1134 d0898867ec4c Various fixes for issues reported by clang static analyzer. Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	639 default:
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	640 delta = jmpSineTab[tmp];
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	641 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	642 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	643
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	644 delta = (delta * chn->tremolo.depth) >> 6;
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	645 jmpCSetVolume(chn, channel, chn->cvolume + (chn->tremolo.pos >= 0 ? delta : -delta));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	646
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	647 chn->tremolo.pos += chn->tremolo.speed;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	648 if (chn->tremolo.pos > 31)
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	649 chn->tremolo.pos -= 64;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	650 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	651 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	652
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	653
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	654 /* Do a vibrato effect for given module channel.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	655 */
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	656 static void jmpDoVibrato(JSSPlayerChannel *chn, int channel)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	657 {
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	658 (void) channel;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	659
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	660 if (chn->vibrato.depth != 0 && chn->vibrato.speed != 0)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	661 {
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	662 int delta, tmp = chn->vibrato.pos & 31;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	663
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	664 switch (chn->vibrato.wc & 3)
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	665 {
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	666 case 0:
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	667 delta = jmpSineTab[tmp];
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	668 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	669 case 1:
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	670 tmp <<= 3;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	671 delta = (chn->vibrato.pos < 0) ? 255 - tmp : tmp;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	672 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	673 case 2:
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	674 delta = 255;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	675 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	676 case 3:
1134 d0898867ec4c Various fixes for issues reported by clang static analyzer. Matti Hamalainen <ccr@tnsp.org> parents: 1127 diff changeset	677 default:
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	678 delta = jmpSineTab[tmp];
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	679 break;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	680 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	681
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	682 delta = ((delta * chn->vibrato.depth) >> 7) << 2;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	683 chn->freq = chn->cfreq + (chn->vibrato.pos >= 0 ? delta : -delta);
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	684 JMPSETNDFLAGS(cdfNewFreq);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	685
231 e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	686 chn->vibrato.pos += chn->vibrato.speed;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	687 if (chn->vibrato.pos > 31)
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	688 chn->vibrato.pos -= 64;
e65fed571d7a Improve vibrato implementation. Might not work in Amiga periods mode, tho. Matti Hamalainen <ccr@tnsp.org> parents: 228 diff changeset	689 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	690 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	691
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	692
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	693 /* Do a volume slide effect for given module channel.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	694 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	695 static void jmpDoVolumeSlide(JSSPlayerChannel * chn, int channel, int param)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	696 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	697 int paramX, paramY;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	698
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	699 JMPMAKEPARAM(param, paramX, paramY)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	700
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	701 if (paramY == 0)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	702 jmpChangeVolume(chn, channel, paramX);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	703 if (paramX == 0)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	704 jmpChangeVolume(chn, channel, -paramY);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	705 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	706
225 83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	707 static void jmpTriggerNote(JSSPlayer * mp, JSSPlayerChannel *chn, BOOL newExtInstrument);
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	708
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	709
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	710 static void jmpDoMultiRetrigNote(JSSPlayer mp, JSSPlayerChannel chn, int channel)
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	711 {
226 725ac9d4962f Oops, a typo. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	712 if (chn->lastMultiRetrigParamY != 0 &&
725ac9d4962f Oops, a typo. Fixed. Matti Hamalainen <ccr@tnsp.org> parents: 225 diff changeset	713 (mp->tick % chn->lastMultiRetrigParamY) == 0)
225 83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	714 {
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	715 BOOL change = TRUE;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	716 int volume = chn->volume;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	717 switch (chn->lastMultiRetrigParamX)
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	718 {
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	719 case 0x1: volume -= 1; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	720 case 0x2: volume -= 2; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	721 case 0x3: volume -= 4; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	722 case 0x4: volume -= 8; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	723 case 0x5: volume -= 16; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	724 case 0x6: volume = (volume * 2) / 3; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	725 case 0x7: volume /= 2; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	726
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	727 case 0x9: volume += 1; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	728 case 0xA: volume += 2; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	729 case 0xB: volume += 4; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	730 case 0xC: volume += 8; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	731 case 0xD: volume += 16; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	732 case 0xE: volume = (volume * 3) / 2; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	733 case 0xF: volume *= 2; break;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	734 default: change = FALSE;
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	735 }
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	736 jmpTriggerNote(mp, chn, FALSE);
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	737 if (change)
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	738 jmpSetVolume(chn, channel, volume);
225 83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	739 }
83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	740 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	741
558 67d9e319246f Update some comments. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	742
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	743 /* Execute a pattern loop effect/command for given module channel.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	744 *
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	745 * This routine works for most of the supported formats, as they
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	746 * use the 'standard' implementation ascending from MOD. However,
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	747 * here is included also a slightly kludgy implementation of the
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	748 * FT2 patloop bug.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	749 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	750 static void jmpDoPatternLoop(JSSPlayer * mp, JSSPlayerChannel *chn, int channel, int paramY)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	751 {
61 a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	752 (void) channel;
a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	753
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	754 // Check what we need to do
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	755 if (paramY > 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	756 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	757 // SBx/E6x loops 'x' times
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	758 if (chn->iPatLoopCount == 1)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	759 chn->iPatLoopCount = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	760 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	761 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	762 // Check if we need to set the count
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	763 if (chn->iPatLoopCount == 0)
175 4192aa6d5af6 Cosmetic cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 174 diff changeset	764 chn->iPatLoopCount = paramY + 1;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	765
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	766 // Loop to specified row
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	767 chn->iPatLoopCount--;
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	768 mp->newRow = chn->iPatLoopRow;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	769 mp->newRowSet = TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	770 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	771 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	772 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	773 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	774 // SB0/E60 sets the loop start point
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	775 chn->iPatLoopRow = mp->row;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	776
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	777 // This is here because of the infamous FT2 patloop bug
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	778 mp->lastPatLoopRow = mp->row;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	779 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	780 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	781
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	782
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	783 /* Do arpeggio effect
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	784 */
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	785 static void jmpDoArpeggio(JSSPlayer * mp, JSSPlayerChannel *chn, int channel, int paramY, int paramX)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	786 {
218 c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	787 JSSInstrument *inst = chn->instrument;
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	788 (void) channel;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	789
218 c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	790 if (inst != NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	791 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	792 int tmp = chn->note;
218 c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	793 if (tmp == jsetNotSet \|\| tmp == jsetNoteOff)
c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	794 return;
c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	795
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	796 switch (mp->tick & 3)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	797 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	798 case 1:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	799 tmp += paramX;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	800 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	801 case 2:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	802 tmp += paramY;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	803 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	804 }
218 c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	805
c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	806 tmp = dmClamp(tmp + inst->ERelNote, 0, 119);
c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	807 jmpCSetPitch(mp, chn, jmpGetPeriodFromNote(mp, tmp, inst->EFineTune));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	808 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	809 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	810
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	811
558 67d9e319246f Update some comments. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	812 /* Trigger a new note on the given channel.
67d9e319246f Update some comments. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	813 * Separate function used from various places where note
67d9e319246f Update some comments. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	814 * triggering is needed (retrig, multi-retrig, etc.)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	815 */
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	816 static void jmpTriggerNote(JSSPlayer * mp, JSSPlayerChannel *chn, BOOL newExtInstrument)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	817 {
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	818 if (chn->nextInstrument >= 0 &&
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	819 chn->nextInstrument < mp->module->nextInstruments &&
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	820 mp->module->extInstruments[chn->nextInstrument] != NULL)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	821 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	822 chn->extInstrument = mp->module->extInstruments[chn->nextInstrument];
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	823 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	824 else
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	825 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	826 chn->extInstrument = NULL;
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	827 chn->instrument = NULL;
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	828 chn->ninstrument = jsetNotSet;
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	829 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	830
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	831 if (chn->extInstrument != NULL)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	832 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	833 int tmp = chn->extInstrument->sNumForNotes[chn->note];
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	834
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	835 if (tmp >= 0 && tmp < mp->module->ninstruments &&
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	836 mp->module->instruments[tmp] != NULL)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	837 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	838 if (chn->ninstrument != tmp)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	839 JMPSETNDFLAGS(cdfNewInstr);
228 4d979914e837 Use jvmReset appropriately, fixes(?) taotao.xm vs. boost.xm vs. vital.xm issues. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	840 else
4d979914e837 Use jvmReset appropriately, fixes(?) taotao.xm vs. boost.xm vs. vital.xm issues. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	841 JMPSETNDFLAGS(cdfPlay);
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	842
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	843 chn->ninstrument = tmp;
228 4d979914e837 Use jvmReset appropriately, fixes(?) taotao.xm vs. boost.xm vs. vital.xm issues. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	844 chn->instrument = mp->module->instruments[tmp];
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	845
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	846 if (newExtInstrument)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	847 {
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	848 chn->volume = chn->instrument->volume;
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	849 chn->panning = chn->instrument->EPanning;
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	850 JMPSETNDFLAGS(cdfNewPanPos \| cdfNewVolume);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	851 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	852 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	853 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	854
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	855 if (chn->instrument != NULL)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	856 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	857 int tmp;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	858 JSSInstrument *inst = chn->instrument;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	859
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	860 // Save old pitch for later use
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	861 chn->oldPitch = chn->pitch;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	862
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	863 chn->position = 0;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	864
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	865 // Compute new pitch
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	866 tmp = dmClamp(chn->note + inst->ERelNote, 0, 119);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	867 chn->pitch = jmpGetPeriodFromNote(mp, tmp, inst->EFineTune);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	868 JMPSETNDFLAGS(cdfNewPitch \| cdfPlay \| cdfNewPos);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	869 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	870 else
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	871 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	872 chn->volume = 0;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	873 chn->panning = jchPanMiddle;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	874 JMPSETNDFLAGS(cdfStop \| cdfNewPanPos \| cdfNewVolume);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	875 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	876 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	877
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	878
558 67d9e319246f Update some comments. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	879 /*
67d9e319246f Update some comments. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	880 * Process a new pattern row
67d9e319246f Update some comments. Matti Hamalainen <ccr@tnsp.org> parents: 555 diff changeset	881 */
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	882 static void jmpProcessNewRow(JSSPlayer * mp, int channel)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	883 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	884 JSSNote *currNote;
299 26ead9094940 Implement correct handling of 'M' and '3xx' effects together (aka volume Matti Hamalainen <ccr@tnsp.org> parents: 272 diff changeset	885 BOOL newNote = FALSE, newExtInstrument = FALSE, volumePortaSet = FALSE;
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	886 char effect;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	887 int param, paramX, paramY;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	888 JSSPlayerChannel *chn = &(mp->channels[channel]);
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	889
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	890 JMPGETNOTE(currNote, mp->row, channel);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	891
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	892 // Check for a new note/keyoff here
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	893 if (currNote->note == jsetNoteOff)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	894 chn->keyOff = TRUE;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	895 else
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	896 if (currNote->note >= 0 && currNote->note <= 96)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	897 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	898 newNote = TRUE;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	899 chn->oldNote = chn->note;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	900 chn->note = currNote->note;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	901 chn->keyOff = FALSE;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	902 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	903
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	904 // Check for new instrument
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	905 if (currNote->instrument != jsetNotSet)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	906 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	907 /* Envelopes and ext.instrument fadeout are initialized always if
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	908 * new instrument is set, even if the instrument does not exist.
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	909 */
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	910 jmpResetEnvelope(&chn->volumeEnv);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	911 jmpResetEnvelope(&chn->panningEnv);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	912 chn->keyOff = FALSE;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	913 chn->fadeOutVol = mpMaxFadeoutVol;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	914
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	915 JMPSETNDFLAGS(cdfNewPanPos \| cdfPlay \| cdfNewVolume);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	916
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	917 // We save the instrument number here for later use
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	918 chn->nextInstrument = currNote->instrument;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	919 newExtInstrument = TRUE;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	920 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	921
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	922 if (newNote)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	923 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	924 jmpTriggerNote(mp, chn, newExtInstrument);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	925 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	926
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	927 // Process the volume column
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	928 JMPMAKEPARAM(currNote->volume, paramX, paramY);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	929
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	930 switch (paramX)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	931 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	932 case 0x0:
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	933 case 0x1:
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	934 case 0x2:
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	935 case 0x3:
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	936 case 0x4:
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	937 jmpSetVolume(chn, channel, currNote->volume);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	938 break;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	939
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	940 case 0x7: // Dx = Fine Volumeslide Down : IMPL.VERIFIED
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	941 jmpChangeVolume(chn, channel, -paramY);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	942 break;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	943
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	944 case 0x8: // Ux = Fine Volumeslide Up : IMPL.VERIFIED
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	945 jmpChangeVolume(chn, channel, paramY);
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	946 break;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	947
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	948 case 0x9: // Sx = Set vibrato speed : IMPL.VERIFIED
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	949 chn->vibrato.speed = paramY;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	950 break;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	951
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	952 case 0xa: // Vx = Vibrato : IMPL.VERIFIED
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	953 if (paramY)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	954 chn->vibrato.depth = paramY;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	955 break;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	956
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	957 case 0xe: // Mx = Porta To Note : IMPL.VERIFIED
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	958 if (paramY)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	959 chn->iLastPortaToNoteParam = paramY * 16;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	960
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	961 if (currNote->note != jsetNotSet && currNote->note != jsetNoteOff)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	962 {
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	963 chn->lastPortaToNoteNote = chn->note;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	964 chn->iLastPortaToNotePitch = chn->pitch;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	965 chn->pitch = chn->oldPitch;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	966 chn->note = chn->oldNote;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	967 JMPUNSETNDFLAGS(cdfNewPitch \| cdfPlay);
299 26ead9094940 Implement correct handling of 'M' and '3xx' effects together (aka volume Matti Hamalainen <ccr@tnsp.org> parents: 272 diff changeset	968 volumePortaSet = TRUE;
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	969 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	970 break;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	971 }
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	972
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	973 // ...And finally process the Normal effects
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	974 if (currNote->effect == jsetNotSet)
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	975 return;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	976
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	977 param = currNote->param;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	978 JMPMAKEPARAM(param, paramX, paramY);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	979 JMPGETEFFECT(effect, currNote->effect);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	980
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	981 switch (effect)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	982 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	983 case '0': // 0xy = Arpeggio
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	984 jmpDoArpeggio(mp, chn, channel, paramX, paramY);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	985 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	986
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	987 case 'W': // Used widely in demo-music as MIDAS Sound System sync-command
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	988 case 'Q': // SoundTracker/OpenCP: Qxx = Set LP filter resonance
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	989 case 'Z': // SoundTracker/OpenCP: Zxx = Set LP filter cutoff freq
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	990 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	991
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	992 case '1':
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	993 case '2': // 1xy = Portamento Up, 2xy = Portamento Down : IMPL.VERIFIED
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	994 if (param)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	995 chn->iLastPortaParam = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	996 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	997
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	998 case '3': // 3xy = Porta To Note
299 26ead9094940 Implement correct handling of 'M' and '3xx' effects together (aka volume Matti Hamalainen <ccr@tnsp.org> parents: 272 diff changeset	999 if (volumePortaSet)
26ead9094940 Implement correct handling of 'M' and '3xx' effects together (aka volume Matti Hamalainen <ccr@tnsp.org> parents: 272 diff changeset	1000 break;
26ead9094940 Implement correct handling of 'M' and '3xx' effects together (aka volume Matti Hamalainen <ccr@tnsp.org> parents: 272 diff changeset	1001
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1002 if (param)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1003 chn->iLastPortaToNoteParam = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1004
170 fb95285c3ed9 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	1005 if (currNote->note != jsetNotSet && currNote->note != jsetNoteOff)
fb95285c3ed9 Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 169 diff changeset	1006 {
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	1007 chn->lastPortaToNoteNote = chn->note;
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1008 chn->iLastPortaToNotePitch = chn->pitch;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1009 chn->pitch = chn->oldPitch;
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	1010 chn->note = chn->oldNote;
81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	1011 JMPUNSETNDFLAGS(cdfNewPitch \| cdfPlay);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1012 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1013 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1014
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1015 case '4': // 4xy = Vibrato : IMPL.VERIFIED
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1016 if (paramX)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1017 chn->vibrato.speed = paramX;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1018
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1019 if (paramY)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1020 chn->vibrato.depth = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1021
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1022 if ((chn->vibrato.wc & 4) == 0)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1023 chn->vibrato.pos = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1024 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1025
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1026 case '5': // 5xy = Portamento + Volume Slide
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1027 case '6': // 6xy = Vibrato + Volume slide
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1028 if (param)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1029 chn->iLastVolSlideParam = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1030 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1031
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1032 case '7': // 7xy = Tremolo
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1033 if (paramX)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1034 chn->tremolo.speed = paramX;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1035
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1036 if (paramY)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1037 chn->tremolo.depth = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1038
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1039 if ((chn->tremolo.wc & 4) == 0)
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1040 chn->tremolo.pos = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1041 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1042
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1043 case '8': // 8xx = Set Panning
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1044 chn->panning = param;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1045 JMPSETNDFLAGS(cdfNewPanPos);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1046 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1047
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1048 case '9': // 9xx = Set Sample Offset : IMPL.VERIFIED
271 6d9a3577741b XM effect '9xx' stores its last non-zero parameter. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	1049 if (param != 0)
6d9a3577741b XM effect '9xx' stores its last non-zero parameter. Matti Hamalainen <ccr@tnsp.org> parents: 231 diff changeset	1050 chn->lastSampleOffsetParam = param;
272 64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1051 if (chn->newDataFlags & cdfNewPitch && chn->instrument != NULL)
30 ca0e00facb7b Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 0 diff changeset	1052 {
272 64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1053 int pos = chn->lastSampleOffsetParam * 0x100,
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1054 end = (chn->instrument->flags & jsfLooped) ?
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1055 chn->instrument->loopE : chn->instrument->size;
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1056 if (pos <= end)
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1057 {
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1058 chn->position = pos;
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1059 JMPSETNDFLAGS(cdfNewPos);
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1060 }
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1061 else
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1062 {
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1063 JMPSETNDFLAGS(cdfStop);
64876c3cbcf3 XM sample offset effect '9xx' stops note playing if offset is > sample Matti Hamalainen <ccr@tnsp.org> parents: 271 diff changeset	1064 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1065 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1066 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1067
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1068 case 'A': // Axy = Volume Slide : IMPL.VERIFIED
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1069 if (param)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1070 chn->iLastVolSlideParam = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1071 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1072
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1073 case 'B': // Bxx = Pattern Jump : IMPL.VERIFIED
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1074 mp->newOrder = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1075 mp->newOrderSet = TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1076 mp->jumpFlag = TRUE;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1077 mp->lastPatLoopRow = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1078 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1079
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1080 case 'C': // Cxx = Set Volume : IMPL.VERIFIED
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1081 jmpSetVolume(chn, channel, param);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1082 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1083
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1084 case 'D': // Dxx = Pattern Break : IMPL.VERIFIED
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1085 // Compute the new row
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1086 mp->newRow = (paramX * 10) + paramY;
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1087 if (mp->newRow >= mp->pattern->nrows)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1088 mp->newRow = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1089
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1090 mp->newRowSet = TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1091
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1092 // Now we do some tricky tests
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1093 if (!mp->breakFlag && !mp->jumpFlag)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1094 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1095 mp->newOrder = mp->order + 1;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1096 mp->newOrderSet = TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1097 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1098
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1099 mp->breakFlag = TRUE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1100 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1101
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1102 case 'E': // Exy = Special Effects
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1103 switch (paramX)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1104 {
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1105 case 0x00: // E0x - Set filter (NOT SUPPORTED)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1106 JMPDEBUG("Set Filter used, UNSUPPORTED");
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1107 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1108
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1109 case 0x01: // E1x - Fine Portamento Up
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1110 if (paramY)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1111 chn->iCLastFinePortamentoUpParam = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1112
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1113 jmpChangePitch(chn, channel, -(chn->iCLastFinePortamentoUpParam * 4));
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1114 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1115
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1116 case 0x02: // E2x - Fine Portamento Down
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1117 if (paramY)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1118 chn->iCLastFinePortamentoDownParam = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1119
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1120 jmpChangePitch(chn, channel, (chn->iCLastFinePortamentoDownParam * 4));
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1121 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1122
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1123 case 0x03: // E3x - Glissando Control (NOT SUPPORTED)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1124 break;
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1125
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1126 case 0x04: // E4x - Set Vibrato waveform
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1127 chn->vibrato.wc = paramY;
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1128 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1129
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1130 case 0x05: // E5x - Set Finetune
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1131 JMPDEBUG("Set Finetune used, UNIMPLEMENTED");
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1132 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1133
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1134 case 0x06: // E6x - Set Pattern Loop
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1135 jmpDoPatternLoop(mp, chn, channel, paramY);
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1136 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1137
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1138 case 0x07: // E7x - Set Tremolo waveform
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1139 chn->tremolo.wc = paramY;
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1140 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1141
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1142 case 0x08: // E8x - Set Pan Position
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1143 chn->panning = (paramY * 16);
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1144 JMPSETNDFLAGS(cdfNewPanPos);
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1145 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1146
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1147 case 0x09: // E9x - Retrig note
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1148 if (mp->tick == paramY)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1149 jmpTriggerNote(mp, chn, FALSE);
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1150 break;
224 81f3993412ae Move jmpProcessRowEffect() into jmpProcessNewRow(); Fix volume-column tone Matti Hamalainen <ccr@tnsp.org> parents: 223 diff changeset	1151
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1152 case 0x0a: // EAx - Fine Volumeslide Up
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1153 if (paramY)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1154 chn->iCLastFineVolumeslideUpParam = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1155
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1156 jmpChangeVolume(chn, channel, chn->iCLastFineVolumeslideUpParam);
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1157 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1158
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1159 case 0x0b: // EBx - Fine Volumeslide Down
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1160 if (paramY)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1161 chn->iCLastFineVolumeslideDownParam = paramY;
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1162 jmpChangeVolume(chn, channel, -(chn->iCLastFineVolumeslideDownParam));
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1163 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1164
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1165 case 0x0c: // ECx - Set Note Cut (NOT PROCESSED IN TICK0)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1166 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1167
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1168 case 0x0d: // EDx - Set Note Delay : IMPL.VERIFIED
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1169 if (paramY > 0)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1170 {
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1171 // Save the ND-flags, then clear
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1172 chn->iSaveNDFlags = chn->newDataFlags;
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1173 chn->newDataFlags = 0;
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1174 // TODO .. does this only affect NOTE or also instrument?
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1175 }
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1176 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1177
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1178 case 0x0e: // EEx - Set Pattern Delay : IMPL.VERIFIED
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1179 mp->patternDelay = paramY;
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1180 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1181
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1182 case 0x0f: // EFx - Invert Loop (NOT SUPPORTED)
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1183 JMPDEBUG("Invert Loop used, UNSUPPORTED");
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1184 break;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1185
555 31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1186 default:
31652085440a Cosmetics. Matti Hamalainen <ccr@tnsp.org> parents: 365 diff changeset	1187 JMPDEBUG("Unsupported special command used");
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1188 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1189 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1190
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1191 case 'F': // Fxy = Set Speed / Tempo : IMPL.VERIFIED
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1192 if (param > 0)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1193 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1194 if (param < 0x20)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1195 mp->speed = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1196 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1197 jmpSetTempo(mp, param);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1198 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1199 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1200
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1201 case 'G': // Gxx = Global Volume
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1202 mp->globalVol = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1203 JMPSETNDFLAGS(cdfNewGlobalVol);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1204 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1205
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1206
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1207 case 'H': // Hxx = Global Volume Slide
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1208 JMPDEBUG("Global Volume Slide used, UNIMPLEMENTED");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1209 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1210
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1211 case 'K': // Kxx = Key-off (Same as key-off note)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1212 chn->keyOff = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1213 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1214
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1215 case 'L': // Lxx = Set Envelope Position
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1216 JMPDEBUG("Set Envelope Position used, NOT verified with FT2");
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1217 chn->panningEnv.frame = param;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1218 chn->volumeEnv.frame = param;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1219 chn->panningEnv.exec = TRUE;
a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1220 chn->volumeEnv.exec = TRUE;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1221 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1222
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1223 case 'R': // Rxy = Multi Retrig note
223 9fa8e9326d18 Implement effect Rxy - multi retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	1224 if (paramX != 0)
9fa8e9326d18 Implement effect Rxy - multi retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	1225 chn->lastMultiRetrigParamX = paramX;
9fa8e9326d18 Implement effect Rxy - multi retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	1226 if (paramY != 0)
9fa8e9326d18 Implement effect Rxy - multi retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	1227 chn->lastMultiRetrigParamY = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1228 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1229
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1230 case 'T': // Txy = Tremor
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1231 if (param)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1232 chn->iLastTremorParam = param;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1233 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1234
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1235 case 'X': // Xxy = Extra Fine Portamento
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1236 switch (paramX)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1237 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1238 case 0x01: // X1y - Extra Fine Portamento Up
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1239 if (paramY)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1240 chn->iCLastExtraFinePortamentoUpParam = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1241
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1242 jmpChangePitch(chn, channel, - chn->iCLastExtraFinePortamentoUpParam);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1243 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1244
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1245 case 0x02: // X2y - Extra Fine Portamento Down
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1246 if (paramY)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1247 chn->iCLastExtraFinePortamentoDownParam = paramY;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1248
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1249 jmpChangePitch(chn, channel, chn->iCLastExtraFinePortamentoUpParam);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1250 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1251
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1252 default:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1253 JMPDEBUG("Unsupported value in Extra Fine Portamento command!");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1254 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1255 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1256 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1257
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1258 default:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1259 JMPDEBUG("Unsupported effect");
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1260 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1261 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1262 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1263
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1264
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1265 static void jmpProcessEffects(JSSPlayer * mp, int channel)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1266 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1267 JSSPlayerChannel *chn = &(mp->channels[channel]);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1268 JSSNote *currNote;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1269 int param, paramX, paramY, tmp;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1270 char effect;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1271
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1272 // Process the volume column effects
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1273 JMPGETNOTE(currNote, mp->row, channel);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1274 JMPMAKEPARAM(currNote->volume, paramX, paramY);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1275
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1276 switch (paramX)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1277 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1278 case 0x05: // -x = Volumeslide Down : IMPL.VERIFIED
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1279 jmpChangeVolume(chn, channel, -paramY);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1280 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1281
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1282 case 0x06: // +x = Volumeslide Down : IMPL.VERIFIED
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1283 jmpChangeVolume(chn, channel, paramY);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1284 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1285
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1286 case 0x0a: // Vx = Vibrato : IMPL.VERIFIED
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1287 jmpDoVibrato(chn, channel);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1288 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1289
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1290 case 0x0e: // Mx = Porta To Note : IMPL.VERIFIED
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1291 jmpDoPortamento(chn, channel);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1292 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1293 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1294
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1295 // ...And finally process the Normal effects
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1296 if (currNote->effect == jsetNotSet)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1297 return;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	1298
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1299 param = currNote->param;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1300 JMPMAKEPARAM(param, paramX, paramY);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1301 JMPGETEFFECT(effect, currNote->effect);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1302
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1303 switch (effect)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1304 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1305 case '0': // 0xy = Arpeggio
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1306 jmpDoArpeggio(mp, chn, channel, paramX, paramY);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1307 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1308
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1309 case '1': // 1xy = Portamento Up
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1310 if (chn->iLastPortaParam > 0)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1311 jmpChangePitch(chn, channel, -(chn->iLastPortaParam * 4));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1312 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1313
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1314 case '2': // 2xy = Portamento Down
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1315 if (chn->iLastPortaParam > 0)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1316 jmpChangePitch(chn, channel, (chn->iLastPortaParam * 4));
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1317 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1318
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1319 case '3': // 3xy = Porta To Note
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1320 jmpDoPortamento(chn, channel);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1321 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1322
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1323 case '4': // 4xy = Vibrato
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1324 jmpDoVibrato(chn, channel);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1325 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1326
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1327 case '5': // 5xy = Portamento + Volume Slide
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1328 jmpDoPortamento(chn, channel);
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1329 jmpDoVolumeSlide(chn, channel, chn->iLastVolSlideParam);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1330 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1331
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1332 case '6': // 6xy = Vibrato + Volume Slide
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1333 jmpDoVibrato(chn, channel);
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1334 jmpDoVolumeSlide(chn, channel, chn->iLastVolSlideParam);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1335 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1336
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1337 case '7': // 7xy = Tremolo
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1338 jmpDoTremolo(chn, channel);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1339 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1340
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1341 case 'A': // Axy = Volume slide
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1342 jmpDoVolumeSlide(chn, channel, chn->iLastVolSlideParam);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1343 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1344
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1345 case 'E': // Exy = Special Effects
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1346 switch (paramX)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1347 {
222 63be671823d3 Implement effect E9x - Retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	1348 case 0x09: // E9x - Retrig note
63be671823d3 Implement effect E9x - Retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	1349 if (mp->tick == paramY)
63be671823d3 Implement effect E9x - Retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	1350 jmpTriggerNote(mp, chn, FALSE);
63be671823d3 Implement effect E9x - Retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	1351 break;
63be671823d3 Implement effect E9x - Retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 221 diff changeset	1352
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1353 case 0x0c: // ECx - Set Note Cut
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1354 if (mp->tick == paramY)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1355 jmpSetVolume(chn, channel, jsetMinVol);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1356 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1357
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1358 case 0x0d: // EDx - Set Note Delay
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1359 if (mp->tick == paramY)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1360 chn->newDataFlags = chn->iSaveNDFlags;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1361 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1362 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1363 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1364
223 9fa8e9326d18 Implement effect Rxy - multi retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	1365 case 'R': // Rxy = Multi Retrig note
225 83f942efc55d Move multi retrig note code to a separate function. Matti Hamalainen <ccr@tnsp.org> parents: 224 diff changeset	1366 jmpDoMultiRetrigNote(mp, chn, channel);
223 9fa8e9326d18 Implement effect Rxy - multi retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	1367 break;
9fa8e9326d18 Implement effect Rxy - multi retrig note. Matti Hamalainen <ccr@tnsp.org> parents: 222 diff changeset	1368
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1369 case 'T': // Txy = Tremor
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1370 JMPMAKEPARAM(chn->iLastTremorParam, paramX, paramY)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1371 paramX++;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1372 paramY++;
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1373 tmp = chn->iTremorCount % (paramX + paramY);
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1374
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1375 if (tmp < paramX)
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1376 jmpCSetVolume(chn, channel, chn->cvolume);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1377 else
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1378 jmpCSetVolume(chn, channel, jsetMinVol);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1379
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1380 chn->iTremorCount = tmp + 1;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1381 break;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1382 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1383 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1384
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1385
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1386 /* This is the main processing callback-loop of a module player.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1387 * It processes the ticks, calling the needed jmpProcessNewRow()
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1388 * and jmpProcessEffects() methods for processing the module playing.
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1389 */
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1390 void jmpExec(void pDEV, void pMP)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1391 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1392 JSSPlayer *mp;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1393
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1394 // Check some things via assert()
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1395 mp = (JSSPlayer *) pMP;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1396 JSS_LOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1397
775 4ff7d7f6f4d1 Silence some warnings. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	1398 (void) pDEV;
4ff7d7f6f4d1 Silence some warnings. Matti Hamalainen <ccr@tnsp.org> parents: 658 diff changeset	1399 // JSSMixer dev = (JSSMixer ) pDEV;
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1400
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1401 // Check if we are playing
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1402 if (!mp->isPlaying)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1403 goto out;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1404
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1405 // Clear channel new data flags
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1406 mp->jumpFlag = FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1407 mp->breakFlag = FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1408
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1409 for (int channel = 0; channel < jsetNChannels; channel++)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1410 mp->channels[channel].newDataFlags = 0;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1411
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1412 //fprintf(stderr, "1: tick=%d, order=%d, iPattern=%d, row=%d\n", mp->tick, mp->order, mp->npattern, mp->row);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1413
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1414 // Check for init-tick
187 e59ea366b13d Sanitize tick handling. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1415 if (mp->tick == jsetNotSet)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1416 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1417 // Initialize pattern
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1418 mp->newRow = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1419 mp->newRowSet = TRUE;
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1420 mp->tick = mp->speed;
187 e59ea366b13d Sanitize tick handling. Matti Hamalainen <ccr@tnsp.org> parents: 186 diff changeset	1421 mp->patternDelay = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1422 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1423
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1424 //fprintf(stderr, "2: tick=%d, order=%d, iPattern=%d, row=%d\n", mp->tick, mp->order, mp->npattern, mp->row);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1425
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1426 // Check if we are playing
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1427 if (!mp->isPlaying)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1428 goto out;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1429
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1430 assert(mp->pattern);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1431
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1432 // Update the tick
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1433 mp->tick++;
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1434 if (mp->tick >= mp->speed)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1435 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1436 // Re-init tick counter
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1437 mp->tick = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1438
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1439 // Check pattern delay
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1440 if (mp->patternDelay > 0)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1441 mp->patternDelay--;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1442 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1443 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1444 // New pattern row
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1445 if (mp->newRowSet)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1446 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1447 mp->row = mp->newRow;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1448 mp->newRowSet = FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1449 } else
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1450 mp->row++;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1451
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1452 // Check for end of pattern
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1453 if (mp->row >= mp->pattern->nrows)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1454 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1455 // Go to next order
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1456 if (mp->order != jsetNotSet)
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1457 jmpSetNewOrder(mp, mp->order + 1);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1458 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1459 mp->isPlaying = FALSE;
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	1460
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1461 // Check for FT2 quirks
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1462 if (JMPGETMODFLAGS(mp, jmdfFT2Replay))
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1463 mp->row = mp->lastPatLoopRow;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1464 else
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1465 mp->row = 0;
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1466 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1467
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1468 if (!mp->isPlaying)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1469 goto out;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1470
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1471 // Check current order
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1472 if (mp->newOrderSet)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1473 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1474 jmpSetNewOrder(mp, mp->newOrder);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1475 mp->newOrderSet = FALSE;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1476 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1477
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1478 //fprintf(stderr, "3: tick=%d, order=%d, iPattern=%d, row=%d\n", mp->tick, mp->order, mp->npattern, mp->row);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1479
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1480 if (!mp->isPlaying)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1481 goto out;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1482
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1483 // TICK #0: Process new row
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1484 for (int channel = 0; channel < mp->module->nchannels; channel++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1485 jmpProcessNewRow(mp, channel);
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1486 } // patternDelay
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1487 } // tick
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1488 else
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1489 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1490 // Implement FT2's pattern delay-effect: don't update effects while on patdelay
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1491 if (!JMPGETMODFLAGS(mp, jmdfFT2Replay) \|\|
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1492 (JMPGETMODFLAGS(mp, jmdfFT2Replay) && mp->patternDelay <= 0))
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1493 {
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1494 // TICK n: Process the effects
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1495 for (int channel = 0; channel < mp->module->nchannels; channel++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1496 jmpProcessEffects(mp, channel);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1497 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1498 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1499
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1500 // Check if playing has stopped
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1501 if (!mp->isPlaying)
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1502 goto out;
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1503
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1504 // Update player data to audio device/mixer
1403 6aa0897265e8 Modernization cleanups. Matti Hamalainen <ccr@tnsp.org> parents: 1167 diff changeset	1505 for (int channel = 0; channel < mp->module->nchannels; channel++)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1506 {
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1507 JSSPlayerChannel *chn = &mp->channels[channel];
e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1508
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1509 // Process extended instruments
61 a33e47232161 Silence some "unused parameter" warnings. Matti Hamalainen <ccr@tnsp.org> parents: 55 diff changeset	1510 jmpProcessExtInstrument(chn, channel);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	1511
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1512 // Check NDFlags and update channel data
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1513 int flags = chn->newDataFlags;
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1514 if (!flags)
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1515 continue;
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1516
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1517 // Check if we stop?
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1518 if (flags & cdfStop)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1519 {
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1520 jvmStop(mp->device, channel);
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1521 }
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1522 else
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1523 {
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1524 // No, handle other flags
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1525 if (flags & cdfNewInstr)
55 e0e470c3fc8e Initial round of cleaning up the player code a bit. Matti Hamalainen <ccr@tnsp.org> parents: 30 diff changeset	1526 {
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1527 JSSInstrument *instr = chn->instrument;
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1528 if (instr != NULL)
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1529 {
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1530 jvmSetSample(mp->device, channel,
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1531 instr->data, instr->size,
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1532 instr->loopS, instr->loopE,
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1533 instr->flags);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1534 }
180 bc8019c38ba5 Refactoring of the note triggering and other player logic, fixes various Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	1535 }
bc8019c38ba5 Refactoring of the note triggering and other player logic, fixes various Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	1536
bc8019c38ba5 Refactoring of the note triggering and other player logic, fixes various Matti Hamalainen <ccr@tnsp.org> parents: 177 diff changeset	1537 if (flags & cdfPlay)
228 4d979914e837 Use jvmReset appropriately, fixes(?) taotao.xm vs. boost.xm vs. vital.xm issues. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	1538 {
4d979914e837 Use jvmReset appropriately, fixes(?) taotao.xm vs. boost.xm vs. vital.xm issues. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	1539 jvmReset(mp->device, channel);
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1540 jvmPlay(mp->device, channel);
228 4d979914e837 Use jvmReset appropriately, fixes(?) taotao.xm vs. boost.xm vs. vital.xm issues. Matti Hamalainen <ccr@tnsp.org> parents: 226 diff changeset	1541 }
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1542
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1543 if (flags & cdfNewPitch)
193 b778cc2fe7c8 Create a separate new frequency flag (vs. new pitch), for future changes. Matti Hamalainen <ccr@tnsp.org> parents: 189 diff changeset	1544 jmpCSetPitch(mp, chn, chn->pitch);
1127 e22d4ceb6414 Cosmetics pass, remove excess and trailing whitespace. Matti Hamalainen <ccr@tnsp.org> parents: 779 diff changeset	1545
218 c619c8b6f696 Fix arpeggio handling. Matti Hamalainen <ccr@tnsp.org> parents: 217 diff changeset	1546 if (flags & (cdfNewFreq \| cdfNewPitch))
193 b778cc2fe7c8 Create a separate new frequency flag (vs. new pitch), for future changes. Matti Hamalainen <ccr@tnsp.org> parents: 189 diff changeset	1547 jvmSetFreq(mp->device, channel, chn->freq);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1548
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1549 if (flags & cdfNewPos)
183 a65f0c3deaa7 Some more player logic cleanups and variable renames. Matti Hamalainen <ccr@tnsp.org> parents: 182 diff changeset	1550 jvmSetPos(mp->device, channel, chn->position);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1551
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1552 if (flags & cdfNewVolume)
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1553 {
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1554 BOOL init = flags & (cdfNewInstr \| cdfPlay);
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1555 jvmSetVolumeRamp(mp->device, channel,
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1556 init ? 0 : jvmGetVolume(mp->device, channel),
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1557 (chn->fadeOutVol * chn->volumeEnv.value * chn->volume) / (16 * 65536),
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1558 init ? 5 : 0);
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1559 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1560
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1561 if (flags & cdfNewPanPos)
365 5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1562 {
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1563 jvmSetPanRamp(mp->device, channel,
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1564 jvmGetPan(mp->device, channel),
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1565 chn->panning + (((chn->panningEnv.value - 32) * (128 - abs(chn->panning - 128))) / 32),
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1566 0);
5a003246a735 Refactor volume and panning handling. Matti Hamalainen <ccr@tnsp.org> parents: 299 diff changeset	1567 }
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1568
144 22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1569 if (flags & cdfNewGlobalVol)
22e1be63f6af Various improvements in XM replay: implement the 5ms volume fadein and Matti Hamalainen <ccr@tnsp.org> parents: 142 diff changeset	1570 jvmSetGlobalVol(mp->device, mp->globalVol);
0 32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1571 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1572 }
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1573
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1574 out:
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1575 JSS_UNLOCK(mp);
32250b436bca Initial re-import. Matti Hamalainen <ccr@tnsp.org> parents: diff changeset	1576 }

Mercurial > hg > dmlib

annotate minijss/jssplr.c @ 2298:b5abfff07ca9