Pushed v1.37 code

- The 4-tap cubic spline resampling interpolation has now been replaced with 8-tap windowed-sinc (polyphase) for better audio quality - The mixer is now using 64-bit float precision instead of 32-bit float precision. We only mix up to 32 channels anyway, which is not very CPU intensive - Volume/panning envelope interpolation is now using floating point precision instead of 8.8 fixed-point precision - Fixed a bug where the scopes would not shut down if you triggered an instrument that is not allocated (empty) - Small code cleanup

Olav Sørensen committed 6 years ago

Commit c8ca0711 parent c0d8c8d32 files · +1636 −1364Browse files

Showing the changes to src (30 of 32 files). Show all

Unified · Split

30 files

src/ft2_about.c +19 −10
src/ft2_audio.c +127 −118
src/ft2_audio.h +7 −8
src/ft2_bmp.c +2 −3
src/ft2_config.c +6 −6
src/ft2_config.h +2 −2
src/ft2_edit.c +1 −1
src/ft2_events.c +1 −1
src/ft2_header.h +3 −3
src/ft2_nibbles.c +8 −1
src/ft2_radiobuttons.c +6 −6
src/ft2_radiobuttons.h +1 −1
src/ft2_replayer.c +71 −85
src/ft2_replayer.h +9 −10
src/ft2_sample_ed.c +225 −35
src/ft2_sample_saver.c +1 −1
src/ft2_scopes.c +2 −2
src/ft2_trim.c +1 −1
src/helpdata/FT2.HLP +1 −1
src/helpdata/ft2_help_data.h +440 −440
src/mixer/ft2_center_mix.c +166 −166
src/mixer/ft2_center_mix.h +12 −12
src/mixer/ft2_cubicspline.c +0 −59
src/mixer/ft2_cubicspline.h +0 −22
src/mixer/ft2_mix.c +194 −194
src/mixer/ft2_mix_macros.h +156 −117
src/mixer/ft2_silence_mix.c +39 −8
src/mixer/ft2_silence_mix.h +0 −47
src/mixer/ft2_windowed_sinc.c +99 −0
src/mixer/ft2_windowed_sinc.h +33 −0

src/ft2_about.c+19−10

@@ -110,19 +110,22 @@ static void starfield(void) · 109 unmodified lines
110	110	*/
111	111
112	112	const float z = (matrix.x.z * star->x) + (matrix.y.z * star->y) + (matrix.z.z * star->z) + 0.5f;
113		− if (z <= 0.0f) continue;
	113	+ if (z <= 0.0f)
	114	+ continue;
114	115
115	116	float y = (((matrix.x.y * star->x) + (matrix.y.y * star->y) + (matrix.z.y * star->z)) / z) * 400.0f;
116	117	y += 2.0f + (ABOUT_SCREEN_H/2.0f);
117	118
118	119	const int32_t outY = (int32_t)(y + 0.5f); // rounded
119		− if ((uint32_t)outY > 2+ABOUT_SCREEN_H) continue;
	120	+ if ((uint32_t)outY > 2+ABOUT_SCREEN_H)
	121	+ continue;
120	122
121	123	float x = (((matrix.x.x * star->x) + (matrix.y.x * star->y) + (matrix.z.x * star->z)) / z) * 400.0f;
122	124	x += 2.0f + (ABOUT_SCREEN_W/2.0f);
123	125
124	126	const int32_t outX = (int32_t)(x + 0.5f); // rounded
125		− if ((uint32_t)outX > 2+ABOUT_SCREEN_W) continue;
	127	+ if ((uint32_t)outX > 2+ABOUT_SCREEN_W)
	128	+ continue;
126	129
127	130	// render star pixel if the pixel under it is the background key
128	131	screenBufferPos = ((uint32_t)outY * SCREEN_W) + (uint32_t)outX;
@@ -131,17 +134,23 @@ static void starfield(void) · 2 unmodified lines
131	134	int32_t d = (int32_t)((255.0f - (z * 235.0f)) + 0.5f);
132	135
133	136	d = (d * starfieldFade) >> 8;
134		− if (d <= 0) continue;
135		− if (d > 255) d = 255;
	137	+ if (d <= 0)
	138	+ continue;
136	139
137		− int32_t r = d - 40;
138		− if (r < 0) r = 0;
	140	+ if (d > 255)
	141	+ d = 255;
	142	+
	143	+ int32_t r = d - 48;
	144	+ if (r < 0)
	145	+ r = 0;
139	146
140	147	int32_t g = d - 14;
141		− if (g < 0) g = 0;
	148	+ if (g < 0)
	149	+ g = 0;
142	150
143		− int32_t b = d + 69; // nice
144		− if (b > 255) b = 255;
	151	+ int32_t b = d + 72;
	152	+ if (b > 255)
	153	+ b = 255;
145	154
146	155	video.frameBuffer[screenBufferPos] = RGB32(r, g, b);
147	156	lastStarScreenPos[i] = screenBufferPos;

src/ft2_audio.c+127−118

@@ -26,14 +26,10 @@ static int8_t pmpCountDiv, pmpChannels = 2; · 25 unmodified lines
26	26	static uint16_t smpBuffSize;
27	27	static int32_t randSeed = INITIAL_DITHER_SEED;
28	28	static uint32_t oldAudioFreq, tickTimeLen, tickTimeLenFrac;
29		−static float fAudioNormalizeMul, fPrngStateL, fPrngStateR, fPanningTab[256+1];
	29	+static double dAudioNormalizeMul, dPrngStateL, dPrngStateR, dPanningTab[256+1];
30	30	static voice_t voice[MAX_VOICES * 2];
31	31	static void (sendAudSamplesFunc)(uint8_t , uint32_t, uint8_t); // "send mixed samples" routines
32	32
33		−static int32_t oldPeriod;
34		−static uint32_t oldRevDelta;
35		−static uint64_t oldDelta;
36		−
37	33	// globalized
38	34	audio_t audio;
39	35	pattSyncData_t *pattSyncEntry;
@@ -44,9 +40,16 @@ volatile bool pattQueueClearing, chQueueClearing; · 4 unmodified lines
44	40
45	41	void resetCachedMixerVars(void)
46	42	{
47		− oldPeriod = -1;
48		− oldDelta = 0;
49		− oldRevDelta = UINT32_MAX;
	43	+ stmTyp *ch = stm;
	44	+ for (int32_t i = 0; i < MAX_VOICES; i++, ch++)
	45	+ ch->oldFinalPeriod = -1;
	46	+
	47	+ voice_t *v = voice;
	48	+ for (int32_t i = 0; i < MAX_VOICES*2; i++, v++)
	49	+ {
	50	+ v->oldDelta = 0;
	51	+ v->oldRevDelta = UINT32_MAX;
	52	+ }
50	53	}
51	54
52	55	void stopVoice(int32_t i)
@@ -122,11 +125,11 @@ void setAudioAmp(int16_t amp, int16_t masterVol, bool bitDepth32Flag) · 69 unmodified lines
122	125	amp = CLAMP(amp, 1, 32);
123	126	masterVol = CLAMP(masterVol, 0, 256);
124	127
125		− float fAmp = (amp * masterVol) / (32.0f * 256.0f);
	128	+ double dAmp = (amp * masterVol) / (32.0 * 256.0);
126	129	if (!bitDepth32Flag)
127		− fAmp *= 32768.0f;
	130	+ dAmp *= 32768.0;
128	131
129		− fAudioNormalizeMul = fAmp;
	132	+ dAudioNormalizeMul = dAmp;
130	133	}
131	134
132	135	void setNewAudioFreq(uint32_t freq) // for song-to-WAV rendering
@@ -176,7 +179,7 @@ void P_SetSpeed(uint16_t bpm) · 43 unmodified lines
176	179	tickTimeLenFrac = tickTimeLen64 & UINT32_MAX;
177	180
178	181	// used for calculating volume ramp length for "ticks" ramps
179		− audio.fRampTickMul = audio.fRampTickMulTab[bpm];
	182	+ audio.dRampTickMul = audio.dRampTickMulTab[bpm];
180	183	}
181	184
182	185	void audioSetVolRamp(bool volRamp)
@@ -197,36 +200,36 @@ void calcPanningTable(void) · 14 unmodified lines
197	200	{
198	201	// same formula as FT2's panning table (with 0.0f..1.0f range)
199	202	for (int32_t i = 0; i <= 256; i++)
200		− fPanningTab[i] = sqrtf(i / 256.0f);
	203	+ dPanningTab[i] = sqrt(i / 256.0);
201	204	}
202	205
203	206	static void voiceUpdateVolumes(int32_t i, uint8_t status)
204	207	{
205		− float fDestVolL, fDestVolR;
	208	+ double dDestVolL, dDestVolR;
206	209
207	210	voice_t *v = &voice[i];
208	211
209		− const float fVolL = v->fVol * fPanningTab[256-v->pan];
210		− const float fVolR = v->fVol * fPanningTab[ v->pan];
	212	+ const double dVolL = v->dVol * dPanningTab[256-v->pan];
	213	+ const double dVolR = v->dVol * dPanningTab[ v->pan];
211	214
212	215	if (!audio.volumeRampingFlag)
213	216	{
214	217	// volume ramping is disabled
215		− v->fVolL = fVolL;
216		− v->fVolR = fVolR;
	218	+ v->dVolL = dVolL;
	219	+ v->dVolR = dVolR;
217	220	v->volRampSamples = 0;
218	221	return;
219	222	}
220	223
221		− v->fDestVolL = fVolL;
222		− v->fDestVolR = fVolR;
	224	+ v->dDestVolL = dVolL;
	225	+ v->dDestVolR = dVolR;
223	226
224	227	if (status & IS_NyTon)
225	228	{
226	229	// sample is about to start, ramp out/in at the same time
227	230
228	231	// setup "fade out" voice (only if current voice volume > 0)
229		− if (v->fVolL > 0.0f \|\| v->fVolR > 0.0f)
	232	+ if (v->dVolL > 0.0 \|\| v->dVolR > 0.0)
230	233	{
231	234	voice_t *f = &voice[MAX_VOICES+i];
232	235
@@ -234,18 +237,18 @@ static void voiceUpdateVolumes(int32_t i, uint8_t status) · 1 unmodified line
234	237
235	238	f->volRampSamples = audio.quickVolRampSamples;
236	239
237		− fDestVolL = -f->fVolL;
238		− fDestVolR = -f->fVolR;
	240	+ dDestVolL = -f->dVolL;
	241	+ dDestVolR = -f->dVolR;
239	242
240		− f->fVolDeltaL = fDestVolL * audio.fRampQuickVolMul;
241		− f->fVolDeltaR = fDestVolR * audio.fRampQuickVolMul;
	243	+ f->dVolDeltaL = dDestVolL * audio.dRampQuickVolMul;
	244	+ f->dVolDeltaR = dDestVolR * audio.dRampQuickVolMul;
242	245
243	246	f->isFadeOutVoice = true;
244	247	}
245	248
246	249	// make current voice fade in from zero when it starts
247		− v->fVolL = 0.0f;
248		− v->fVolR = 0.0f;
	250	+ v->dVolL = 0.0;
	251	+ v->dVolR = 0.0;
249	252	}
250	253
251	254	// ramp volume changes
@@ -256,38 +259,38 @@ static void voiceUpdateVolumes(int32_t i, uint8_t status) · 4 unmodified lines
256	259	*/
257	260
258	261	// if destination volume and current volume is the same (and we have no sample trigger), don't do ramp
259		− if (fVolL == v->fVolL && fVolR == v->fVolR && !(status & IS_NyTon))
	262	+ if (dVolL == v->dVolL && dVolR == v->dVolR && !(status & IS_NyTon))
260	263	{
261	264	// there is no volume change
262	265	v->volRampSamples = 0;
263	266	}
264	267	else
265	268	{
266		− fDestVolL = fVolL - v->fVolL;
267		− fDestVolR = fVolR - v->fVolR;
	269	+ dDestVolL = dVolL - v->dVolL;
	270	+ dDestVolR = dVolR - v->dVolR;
268	271
269	272	if (status & IS_QuickVol)
270	273	{
271	274	v->volRampSamples = audio.quickVolRampSamples;
272		− v->fVolDeltaL = fDestVolL * audio.fRampQuickVolMul;
273		− v->fVolDeltaR = fDestVolR * audio.fRampQuickVolMul;
	275	+ v->dVolDeltaL = dDestVolL * audio.dRampQuickVolMul;
	276	+ v->dVolDeltaR = dDestVolR * audio.dRampQuickVolMul;
274	277	}
275	278	else
276	279	{
277	280	v->volRampSamples = audio.samplesPerTick;
278		− v->fVolDeltaL = fDestVolL * audio.fRampTickMul;
279		− v->fVolDeltaR = fDestVolR * audio.fRampTickMul;
	281	+ v->dVolDeltaL = dDestVolL * audio.dRampTickMul;
	282	+ v->dVolDeltaR = dDestVolR * audio.dRampTickMul;
280	283	}
281	284	}
282	285	}
283	286
284		−static void voiceTrigger(int32_t i, sampleTyp *s, int32_t position)
	287	+static void voiceTrigger(int32_t ch, sampleTyp *s, int32_t position)
285	288	{
286	289	bool sampleIs16Bit;
287	290	uint8_t loopType;
288	291	int32_t length, loopStart, loopLength, loopEnd;
289	292
290		− voice_t *v = &voice[i];
	293	+ voice_t *v = &voice[ch];
291	294	length = s->len;
292	295	loopStart = s->repS;
293	296	loopLength = s->repL;
@@ -321,26 +324,15 @@ static void voiceTrigger(int32_t i, sampleTyp *s, int32_t position) · 27 unmodified lines
321	324	{
322	325	v->base16 = (const int16_t *)s->pek;
323	326	v->revBase16 = &v->base16[loopStart + loopEnd]; // for pingpong loops
324		−
325		− // first tap [-1] sample for special case: if (hasLooped && pos == loopStart)
326		− if (loopType == 1)
327		− v->fTapFixSample = v->base16[loopEnd-1];
328		− else if (loopType == 2)
329		− v->fTapFixSample = v->base16[loopStart];
330	327	}
331	328	else
332	329	{
333	330	v->base8 = s->pek;
334	331	v->revBase8 = &v->base8[loopStart + loopEnd]; // for pingpong loops
335		−
336		− // first tap [-1] sample for special case: if (hasLooped && pos == loopStart)
337		− if (loopType == 1)
338		− v->fTapFixSample = v->base8[loopEnd-1];
339		− else if (loopType == 2)
340		− v->fTapFixSample = v->base8[loopStart];
341	332	}
342	333
343		− v->hasLooped = false; // for cubic interpolation special case (read fTapFixSample comment above)
	334	+ v->dLeftEdgeTaps = s->dLeftEdgeTapSamples + 3;
	335	+ v->hasLooped = false; // for sinc interpolation special case
344	336
345	337	v->backwards = false;
346	338	v->loopType = loopType;
@@ -366,8 +358,8 @@ void resetRampVolumes(void) · 19 unmodified lines
366	358	voice_t *v = voice;
367	359	for (int32_t i = 0; i < song.antChn; i++, v++)
368	360	{
369		− v->fVolL = v->fDestVolL;
370		− v->fVolR = v->fDestVolR;
	361	+ v->dVolL = v->dDestVolL;
	362	+ v->dVolR = v->dDestVolR;
371	363	v->volRampSamples = 0;
372	364	}
373	365	}
@@ -388,7 +380,7 @@ void updateVoices(void) · 14 unmodified lines
388	380	ch->status = 0;
389	381
390	382	if (status & IS_Vol)
391		− v->fVol = ch->fFinalVol;
	383	+ v->dVol = ch->dFinalVol;
392	384
393	385	if (status & IS_Pan)
394	386	v->pan = ch->finalPan;
@@ -399,16 +391,33 @@ void updateVoices(void) · 4 unmodified lines
399	391	if (status & IS_Period)
400	392	{
401	393	// use cached values if possible
402		− const uint16_t period = ch->finalPeriod;
403		− if (period != oldPeriod)
	394	+ if (ch->finalPeriod != ch->oldFinalPeriod)
404	395	{
405		− oldPeriod = period;
406		− oldDelta = getMixerDelta(period);
407		− oldRevDelta = getRevMixerDelta(period);
	396	+ ch->oldFinalPeriod = ch->finalPeriod;
	397	+
	398	+ if (ch->finalPeriod == 0) // in FT2, period 0 -> delta 0
	399	+ {
	400	+ v->oldDelta = 0;
	401	+ v->oldRevDelta = UINT32_MAX;
	402	+ v->dSincLUT = gKaiserSinc;
	403	+ }
	404	+ else
	405	+ {
	406	+ v->oldDelta = getMixerDelta(ch->finalPeriod);
	407	+ v->oldRevDelta = getRevMixerDelta(ch->finalPeriod); // for calc'ing max samples in inner mix loop before sample end/loop end
	408	+
	409	+ // decide which sinc LUT to use according to resampling ratio
	410	+ if (v->oldDelta <= 0x130000000) // 1.1875 (32.32 fixed-point)
	411	+ v->dSincLUT = gKaiserSinc;
	412	+ else if (v->oldDelta <= 0x180000000) // 1.5 (32.32 fixed-point)
	413	+ v->dSincLUT = gDownSample1;
	414	+ else
	415	+ v->dSincLUT = gDownSample2;
	416	+ }
408	417	}
409	418
410		− v->delta = oldDelta;
411		− v->revDelta = oldRevDelta;
	419	+ v->delta = v->oldDelta;
	420	+ v->revDelta = v->oldRevDelta;
412	421	}
413	422
414	423	if (status & IS_NyTon)
@@ -419,8 +428,8 @@ void updateVoices(void) · 4 unmodified lines
419	428	void resetAudioDither(void)
420	429	{
421	430	randSeed = INITIAL_DITHER_SEED;
422		− fPrngStateL = 0.0f;
423		− fPrngStateR = 0.0f;
	431	+ dPrngStateL = 0.0;
	432	+ dPrngStateR = 0.0;
424	433	}
425	434
426	435	static inline int32_t random32(void)
@@ -435,24 +444,24 @@ static inline int32_t random32(void) · 8 unmodified lines
435	444	static void sendSamples16BitDitherStereo(uint8_t *stream, uint32_t sampleBlockLength, uint8_t numAudioChannels)
436	445	{
437	446	int32_t out32;
438		− float fOut, fPrng;
	447	+ double dOut, dPrng;
439	448
440	449	int16_t streamPointer16 = (int16_t )stream;
441	450	for (uint32_t i = 0; i < sampleBlockLength; i++)
442	451	{
443	452	// left channel - 1-bit triangular dithering
444		− fPrng = random32() * (0.5f / INT32_MAX); // -0.5f .. 0.5f
445		− fOut = ((audio.fMixBufferL[i] * fAudioNormalizeMul) + fPrng) - fPrngStateL;
446		− fPrngStateL = fPrng;
447		− out32 = (int32_t)fOut;
	453	+ dPrng = random32() * (0.5 / INT32_MAX); // -0.5 .. 0.5
	454	+ dOut = ((audio.dMixBufferL[i] * dAudioNormalizeMul) + dPrng) - dPrngStateL;
	455	+ dPrngStateL = dPrng;
	456	+ out32 = (int32_t)dOut;
448	457	CLAMP16(out32);
449	458	*streamPointer16++ = (int16_t)out32;
450	459
451	460	// right channel - 1-bit triangular dithering
452		− fPrng = random32() * (0.5f / INT32_MAX); // -0.5f .. 0.5f
453		− fOut = ((audio.fMixBufferR[i] * fAudioNormalizeMul) + fPrng) - fPrngStateR;
454		− fPrngStateR = fPrng;
455		− out32 = (int32_t)fOut;
	461	+ dPrng = random32() * (0.5 / INT32_MAX); // -0.5 .. 0.5
	462	+ dOut = ((audio.dMixBufferR[i] * dAudioNormalizeMul) + dPrng) - dPrngStateR;
	463	+ dPrngStateR = dPrng;
	464	+ out32 = (int32_t)dOut;
456	465	CLAMP16(out32);
457	466	*streamPointer16++ = (int16_t)out32;
458	467	}
@@ -463,24 +472,24 @@ static void sendSamples16BitDitherStereo(uint8_t *stream, uint32_t sampleBlockLe · 4 unmodified lines
463	472	static void sendSamples16BitDitherMultiChan(uint8_t *stream, uint32_t sampleBlockLength, uint8_t numAudioChannels)
464	473	{
465	474	int32_t out32;
466		− float fOut, fPrng;
	475	+ double dOut, dPrng;
467	476
468	477	int16_t streamPointer16 = (int16_t )stream;
469	478	for (uint32_t i = 0; i < sampleBlockLength; i++)
470	479	{
471	480	// left channel - 1-bit triangular dithering
472		− fPrng = random32() * (0.5f / INT32_MAX); // -0.5f..0.5f
473		− fOut = ((audio.fMixBufferL[i] * fAudioNormalizeMul) + fPrng) - fPrngStateL;
474		− fPrngStateL = fPrng;
475		− out32 = (int32_t)fOut;
	481	+ dPrng = random32() * (0.5 / INT32_MAX); // -0.5..0.5
	482	+ dOut = ((audio.dMixBufferL[i] * dAudioNormalizeMul) + dPrng) - dPrngStateL;
	483	+ dPrngStateL = dPrng;
	484	+ out32 = (int32_t)dOut;
476	485	CLAMP16(out32);
477	486	*streamPointer16++ = (int16_t)out32;
478	487
479	488	// right channel - 1-bit triangular dithering
480		− fPrng = random32() * (0.5f / INT32_MAX); // -0.5f..0.5f
481		− fOut = ((audio.fMixBufferR[i] * fAudioNormalizeMul) + fPrng) - fPrngStateR;
482		− fPrngStateR = fPrng;
483		− out32 = (int32_t)fOut;
	489	+ dPrng = random32() * (0.5 / INT32_MAX); // -0.5..0.5
	490	+ dOut = ((audio.dMixBufferR[i] * dAudioNormalizeMul) + dPrng) - dPrngStateR;
	491	+ dPrngStateR = dPrng;
	492	+ out32 = (int32_t)dOut;
484	493	CLAMP16(out32);
485	494	*streamPointer16++ = (int16_t)out32;
486	495
@@ -492,20 +501,20 @@ static void sendSamples16BitDitherMultiChan(uint8_t *stream, uint32_t sampleBloc · 5 unmodified lines
492	501
493	502	static void sendSamples32BitStereo(uint8_t *stream, uint32_t sampleBlockLength, uint8_t numAudioChannels)
494	503	{
495		− float fOut;
	504	+ double dOut;
496	505
497	506	float fStreamPointer32 = (float )stream;
498	507	for (uint32_t i = 0; i < sampleBlockLength; i++)
499	508	{
500	509	// left channel
501		− fOut = audio.fMixBufferL[i] * fAudioNormalizeMul;
502		− fOut = CLAMP(fOut, -1.0f, 1.0f);
503		− *fStreamPointer32++ = fOut;
	510	+ dOut = audio.dMixBufferL[i] * dAudioNormalizeMul;
	511	+ dOut = CLAMP(dOut, -1.0, 1.0);
	512	+ *fStreamPointer32++ = (float)dOut;
504	513
505	514	// right channel
506		− fOut = audio.fMixBufferR[i] * fAudioNormalizeMul;
507		− fOut = CLAMP(fOut, -1.0f, 1.0f);
508		− *fStreamPointer32++ = fOut;
	515	+ dOut = audio.dMixBufferR[i] * dAudioNormalizeMul;
	516	+ dOut = CLAMP(dOut, -1.0, 1.0);
	517	+ *fStreamPointer32++ = (float)dOut;
509	518	}
510	519
511	520	(void)numAudioChannels;
@@ -513,20 +522,20 @@ static void sendSamples32BitStereo(uint8_t *stream, uint32_t sampleBlockLength, · 1 unmodified line
513	522
514	523	static void sendSamples32BitMultiChan(uint8_t *stream, uint32_t sampleBlockLength, uint8_t numAudioChannels)
515	524	{
516		− float fOut;
	525	+ double dOut;
517	526
518	527	float fStreamPointer32 = (float )stream;
519	528	for (uint32_t i = 0; i < sampleBlockLength; i++)
520	529	{
521	530	// left channel
522		− fOut = audio.fMixBufferL[i] * fAudioNormalizeMul;
523		− fOut = CLAMP(fOut, -1.0f, 1.0f);
524		− *fStreamPointer32++ = fOut;
	531	+ dOut = audio.dMixBufferL[i] * dAudioNormalizeMul;
	532	+ dOut = CLAMP(dOut, -1.0, 1.0);
	533	+ *fStreamPointer32++ = (float)dOut;
525	534
526	535	// right channel
527		− fOut = audio.fMixBufferR[i] * fAudioNormalizeMul;
528		− fOut = CLAMP(fOut, -1.0f, 1.0f);
529		− *fStreamPointer32++ = fOut;
	536	+ dOut = audio.dMixBufferR[i] * dAudioNormalizeMul;
	537	+ dOut = CLAMP(dOut, -1.0, 1.0);
	538	+ *fStreamPointer32++ = (float)dOut;
530	539
531	540	// send zeroes to the rest of the channels
532	541	for (uint32_t j = 2; j < numAudioChannels; j++)
@@ -548,17 +557,17 @@ static void doChannelMixing(int32_t samplesToMix) · 15 unmodified lines
548	557	const bool volRampFlag = v->volRampSamples > 0;
549	558	if (volRampFlag)
550	559	{
551		− centerMixFlag = (v->fDestVolL == v->fDestVolR) && (v->fVolDeltaL == v->fVolDeltaR);
	560	+ centerMixFlag = (v->dDestVolL == v->dDestVolR) && (v->dVolDeltaL == v->dVolDeltaR);
552	561	}
553		− else
	562	+ else // no volume ramping active
554	563	{
555		− if (v->fVolL == 0.0f && v->fVolR == 0.0f)
556		− {
	564	+ if (v->dVolL == 0.0 && v->dVolR == 0.0)
	565	+ {
557	566	silenceMixRoutine(v, samplesToMix);
558	567	continue;
559	568	}
560	569
561		− centerMixFlag = v->fVolL == v->fVolR;
	570	+ centerMixFlag = v->dVolL == v->dVolR;
562	571	}
563	572
564	573	mixFuncTab[(centerMixFlag * 36) + (volRampFlag * 18) + v->mixFuncOffset](v, samplesToMix);
@@ -566,7 +575,7 @@ static void doChannelMixing(int32_t samplesToMix) · 1 unmodified line
566	575
567	576	if (r->active) // volume ramp fadeout-voice
568	577	{
569		− const bool centerMixFlag = (r->fDestVolL == r->fDestVolR) && (r->fVolDeltaL == r->fVolDeltaR);
	578	+ const bool centerMixFlag = (r->dDestVolL == r->dDestVolR) && (r->dVolDeltaL == r->dVolDeltaR);
570	579	mixFuncTab[(centerMixFlag * 36) + 18 + r->mixFuncOffset](r, samplesToMix);
571	580	}
572	581	}
@@ -575,8 +584,8 @@ static void doChannelMixing(int32_t samplesToMix) · 2 unmodified lines
575	584	static void mixAudio(uint8_t *stream, uint32_t sampleBlockLength, uint8_t numAudioChannels)
576	585	{
577	586	assert(sampleBlockLength <= MAX_WAV_RENDER_SAMPLES_PER_TICK);
578		− memset(audio.fMixBufferL, 0, sampleBlockLength * sizeof (int32_t));
579		− memset(audio.fMixBufferR, 0, sampleBlockLength * sizeof (int32_t));
	587	+ memset(audio.dMixBufferL, 0, sampleBlockLength * sizeof (double));
	588	+ memset(audio.dMixBufferR, 0, sampleBlockLength * sizeof (double));
580	589
581	590	doChannelMixing(sampleBlockLength);
582	591
@@ -588,8 +597,8 @@ static void mixAudio(uint8_t *stream, uint32_t sampleBlockLength, uint8_t numAud · 5 unmodified lines
588	597	void mixReplayerTickToBuffer(uint32_t samplesToMix, uint8_t *stream, uint8_t bitDepth)
589	598	{
590	599	assert(samplesToMix <= MAX_WAV_RENDER_SAMPLES_PER_TICK);
591		− memset(audio.fMixBufferL, 0, samplesToMix * sizeof (int32_t));
592		− memset(audio.fMixBufferR, 0, samplesToMix * sizeof (int32_t));
	600	+ memset(audio.dMixBufferL, 0, samplesToMix * sizeof (double));
	601	+ memset(audio.dMixBufferR, 0, samplesToMix * sizeof (double));
593	602
594	603	doChannelMixing(samplesToMix);
595	604
@@ -900,7 +909,7 @@ static void fillVisualsSyncBuffer(void) · 304 unmodified lines
900	909	c->sampleNr = s->sampleNr;
901	910	c->envSustainActive = s->envSustainActive;
902	911	c->status = s->tmpStatus;
903		− c->fFinalVol = s->fFinalVol;
	912	+ c->dFinalVol = s->dFinalVol;
904	913	c->smpStartPos = s->smpStartPos;
905	914	}
906	915
@@ -963,37 +972,37 @@ static void SDLCALL audioCallback(void userdata, Uint8 stream, int len) · 56 unmodified lines
963	972
964	973	static bool setupAudioBuffers(void)
965	974	{
966		− const uint32_t sampleSize = sizeof (int32_t);
	975	+ const uint32_t sampleSize = sizeof (double);
967	976
968		− audio.fMixBufferLUnaligned = (float )MALLOC_PAD(MAX_WAV_RENDER_SAMPLES_PER_TICK sampleSize, 256);
969		− audio.fMixBufferRUnaligned = (float )MALLOC_PAD(MAX_WAV_RENDER_SAMPLES_PER_TICK sampleSize, 256);
	977	+ audio.dMixBufferLUnaligned = (double )MALLOC_PAD(MAX_WAV_RENDER_SAMPLES_PER_TICK sampleSize, 256);
	978	+ audio.dMixBufferRUnaligned = (double )MALLOC_PAD(MAX_WAV_RENDER_SAMPLES_PER_TICK sampleSize, 256);
970	979
971		− if (audio.fMixBufferLUnaligned == NULL \|\| audio.fMixBufferRUnaligned == NULL)
	980	+ if (audio.dMixBufferLUnaligned == NULL \|\| audio.dMixBufferRUnaligned == NULL)
972	981	return false;
973	982
974	983	// make aligned main pointers
975		− audio.fMixBufferL = (float *)ALIGN_PTR(audio.fMixBufferLUnaligned, 256);
976		− audio.fMixBufferR = (float *)ALIGN_PTR(audio.fMixBufferRUnaligned, 256);
	984	+ audio.dMixBufferL = (double *)ALIGN_PTR(audio.dMixBufferLUnaligned, 256);
	985	+ audio.dMixBufferR = (double *)ALIGN_PTR(audio.dMixBufferRUnaligned, 256);
977	986
978	987	return true;
979	988	}
980	989
981	990	static void freeAudioBuffers(void)
982	991	{
983		− if (audio.fMixBufferLUnaligned != NULL)
	992	+ if (audio.dMixBufferLUnaligned != NULL)
984	993	{
985		− free(audio.fMixBufferLUnaligned);
986		− audio.fMixBufferLUnaligned = NULL;
	994	+ free(audio.dMixBufferLUnaligned);
	995	+ audio.dMixBufferLUnaligned = NULL;
987	996	}
988	997
989		− if (audio.fMixBufferRUnaligned != NULL)
	998	+ if (audio.dMixBufferRUnaligned != NULL)
990	999	{
991		− free(audio.fMixBufferRUnaligned);
992		− audio.fMixBufferRUnaligned = NULL;
	1000	+ free(audio.dMixBufferRUnaligned);
	1001	+ audio.dMixBufferRUnaligned = NULL;
993	1002	}
994	1003
995		− audio.fMixBufferL = NULL;
996		− audio.fMixBufferR = NULL;
	1004	+ audio.dMixBufferL = NULL;
	1005	+ audio.dMixBufferR = NULL;
997	1006	}
998	1007
999	1008	void updateSendAudSamplesRoutine(bool lockMixer)

src/ft2_audio.h+7−8

@@ -11,8 +11,6 @@ enum · 10 unmodified lines
11	11	FREQ_TABLE_AMIGA = 1,
12	12	};
13	13
14		−#define NUM_FIXED_TAP_SAMPLES 2
15		−
16	14	#define MIN_AUDIO_FREQ 44100
17	15	#define MAX_AUDIO_FREQ 192000
18	16
@@ -35,8 +33,8 @@ typedef struct audio_t · 16 unmodified lines
35	33	int32_t quickVolRampSamples, inputDeviceNum, outputDeviceNum, lastWorkingAudioFreq, lastWorkingAudioBits;
36	34	uint32_t freq, audLatencyPerfValInt, audLatencyPerfValFrac, samplesPerTick, musicTimeSpeedVal;
37	35	uint64_t tickTime64, tickTime64Frac, tickTimeTab[MAX_BPM+1];
38		− float fRampQuickVolMul, fRampTickMul, fRampTickMulTab[MAX_BPM+1];
39		− float fMixBufferL, fMixBufferR, fMixBufferLUnaligned, fMixBufferRUnaligned;
	36	+ double dRampQuickVolMul, dRampTickMul, dRampTickMulTab[MAX_BPM+1];
	37	+ double dMixBufferL, dMixBufferR, dMixBufferLUnaligned, dMixBufferRUnaligned;
40	38	double dAudioLatencyMs, dSamplesPerTick, dTickSampleCounter, dSamplesPerTickTab[MAX_BPM+1];
41	39
42	40	SDL_AudioDeviceID dev;
@@ -50,10 +48,11 @@ typedef struct · 7 unmodified lines
50	48	bool active, backwards, isFadeOutVoice, hasLooped;
51	49	uint8_t mixFuncOffset, pan, loopType;
52	50	int32_t pos, end, loopStart, loopLength;
53		− uint32_t volRampSamples, revDelta;
54		− uint64_t posFrac, delta;
55		− float fTapFixSample; // if (loopStart > 0 && pos == loopStart) useThisForFirstTap();
56		− float fVol, fDestVolL, fDestVolR, fVolL, fVolR, fVolDeltaL, fVolDeltaR;
	51	+ uint32_t volRampSamples, revDelta, oldRevDelta;
	52	+ uint64_t posFrac, delta, oldDelta;
	53	+ const double *dSincLUT;
	54	+ double *dLeftEdgeTaps; // if (loopStart > 0 && pos <= loopStart+3) useTheseTaps();
	55	+ double dVol, dDestVolL, dDestVolR, dVolL, dVolR, dVolDeltaL, dVolDeltaR;
57	56	} voice_t;
58	57
59	58	typedef struct pattSyncData_t

src/ft2_bmp.c+2−3

@@ -94,9 +94,8 @@ bool loadBMPs(void) · 93 unmodified lines
94	94	bmp.checkboxGfx = loadBMPTo4BitPal(checkboxGfxBMP);
95	95
96	96	if (bmp.ft2AboutLogo == NULL \|\| bmp.font1 == NULL \|\| bmp.font2 == NULL \|\|
97		− bmp.font3 == NULL \|\| bmp.font4 == NULL \|\| bmp.font6 == NULL \|\|
98		− bmp.font6 == NULL \|\| bmp.font7 == NULL \|\| bmp.font8 == NULL \|\|
99		− bmp.ft2LogoBadges == NULL \|\| bmp.ft2ByBadges == NULL \|\|
	97	+ bmp.font3 == NULL \|\| bmp.font4 == NULL \|\| bmp.font6 == NULL \|\| bmp.font7 == NULL \|\|
	98	+ bmp.font8 == NULL \|\| bmp.ft2LogoBadges == NULL \|\| bmp.ft2ByBadges == NULL \|\|
100	99	bmp.midiLogo == NULL \|\| bmp.nibblesLogo == NULL \|\| bmp.nibblesStages == NULL \|\|
101	100	bmp.loopPins == NULL \|\| bmp.mouseCursors == NULL \|\| bmp.mouseCursorBusyClock == NULL \|\|
102	101	bmp.mouseCursorBusyGlass == NULL \|\| bmp.whitePianoKeys == NULL \|\| bmp.blackPianoKeys == NULL \|\|

src/ft2_config.c+6−6

@@ -141,7 +141,7 @@ static void loadConfigFromBuffer(void) · 140 unmodified lines
141	141	config.recMIDIVolSens = CLAMP(config.recMIDIVolSens, 0, 200);
142	142	config.recMIDIChn = CLAMP(config.recMIDIChn, 1, 16);
143	143
144		− config.interpolation &= 3; // one extra bit used in FT2 clone (off, cubic, linear)
	144	+ config.interpolation &= 3; // one extra bit used in FT2 clone (off, sinc, linear)
145	145
146	146	if (config.recTrueInsert > 1)
147	147	config.recTrueInsert = 1;
@@ -837,7 +837,7 @@ void setConfigIORadioButtonStates(void) // accessed by other .c files · 689 unmodified lines
837	837	else if (config.interpolation == INTERPOLATION_LINEAR)
838	838	tmpID = RB_CONFIG_AUDIO_INTRP_LINEAR;
839	839	else
840		− tmpID = RB_CONFIG_AUDIO_INTRP_CUBIC;
	840	+ tmpID = RB_CONFIG_AUDIO_INTRP_SINC;
841	841
842	842	radioButtons[tmpID].state = RADIOBUTTON_CHECKED;
843	843
@@ -1168,7 +1168,7 @@ void showConfigScreen(void) · 324 unmodified lines
1168	1168	textOutShadow(390, 105, PAL_FORGRND, PAL_DSKTOP2, "Interpolation:");
1169	1169	textOutShadow(406, 118, PAL_FORGRND, PAL_DSKTOP2, "None");
1170	1170	textOutShadow(406, 132, PAL_FORGRND, PAL_DSKTOP2, "Linear (FT2)");
1171		− textOutShadow(406, 146, PAL_FORGRND, PAL_DSKTOP2, "Cubic spline");
	1171	+ textOutShadow(406, 146, PAL_FORGRND, PAL_DSKTOP2, "Windowed-sinc");
1172	1172	textOutShadow(406, 161, PAL_FORGRND, PAL_DSKTOP2, "Volume ramping");
1173	1173
1174	1174	textOutShadow(509, 3, PAL_FORGRND, PAL_DSKTOP2, "Mixing frequency:");
@@ -1619,11 +1619,11 @@ void rbConfigAudioIntrpLinear(void) · 444 unmodified lines
1619	1619	checkRadioButton(RB_CONFIG_AUDIO_INTRP_LINEAR);
1620	1620	}
1621	1621
1622		−void rbConfigAudioIntrpCubic(void)
	1622	+void rbConfigAudioIntrpSinc(void)
1623	1623	{
1624		− config.interpolation = INTERPOLATION_CUBIC;
	1624	+ config.interpolation = INTERPOLATION_SINC;
1625	1625	audioSetInterpolationType(config.interpolation);
1626		− checkRadioButton(RB_CONFIG_AUDIO_INTRP_CUBIC);
	1626	+ checkRadioButton(RB_CONFIG_AUDIO_INTRP_SINC);
1627	1627	}
1628	1628
1629	1629	void rbConfigAudio44kHz(void)

src/ft2_config.h+2−2

@@ -19,7 +19,7 @@ enum · 18 unmodified lines
19	19	CONFIG_SHOW_ERRORS = 1,
20	20
21	21	INTERPOLATION_NONE = 0,
22		− INTERPOLATION_CUBIC = 1,
	22	+ INTERPOLATION_SINC = 1,
23	23	INTERPOLATION_LINEAR = 2,
24	24
25	25	MOUSE_IDLE_SHAPE_NICE = 0,
@@ -211,7 +211,7 @@ void rbConfigAudio16bit(void); · 185 unmodified lines
211	211	void rbConfigAudio24bit(void);
212	212	void rbConfigAudioIntrpNone(void);
213	213	void rbConfigAudioIntrpLinear(void);
214		−void rbConfigAudioIntrpCubic(void);
	214	+void rbConfigAudioIntrpSinc(void);
215	215	void rbConfigAudio44kHz(void);
216	216	void rbConfigAudio48kHz(void);
217	217	void rbConfigAudio96kHz(void);

src/ft2_edit.c+1−1

@@ -963,7 +963,7 @@ void doTranspose(void) · 962 unmodified lines
963	963	countOverflowingNotes(lastInsMode, lastTranspMode, lastTranspVal);
964	964	if (transpDelNotes > 0)
965	965	{
966		− sprintf(text, "%d note(s) will be erased! Proceed?", transpDelNotes);
	966	+ sprintf(text, "%d note(s) will be erased! Proceed?", (int32_t)transpDelNotes);
967	967	if (okBox(2, "System request", text) != 1)
968	968	return;
969	969	}

src/ft2_events.c+1−1

@@ -311,7 +311,7 @@ static LONG WINAPI exceptionHandler(EXCEPTION_POINTERS *ptr) · 310 unmodified lines
311	311	// find a free filename
312	312	for (i = 1; i < 1000; i++)
313	313	{
314		− sprintf(fileName, "backup%03d.xm", i);
	314	+ sprintf(fileName, "backup%03d.xm", (int32_t)i);
315	315	if (stat(fileName, &statBuffer) != 0)
316	316	break; // filename OK
317	317	}

src/ft2_header.h+3−3

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	12	#endif
13	13	#include "ft2_replayer.h"
14	14
15		−#define PROG_VER_STR "1.36"
	15	+#define PROG_VER_STR "1.37"
16	16
17	17	// do NOT change these! It will only mess things up...
18	18
@@ -33,8 +33,8 @@ · 14 unmodified lines
33	33	** branchless in the inner channel mixer loop.
34	34	** Warning: Do not change this!
35	35	*/
36		−#define LOOP_FIX_LEN 8
37		−#define SMP_DAT_OFFSET 4
	36	+#define LOOP_FIX_LEN 32
	37	+#define SMP_DAT_OFFSET 8
38	38
39	39	#ifndef _WIN32
40	40	#define _stricmp strcasecmp

src/ft2_nibbles.c+8−1

@@ -362,7 +362,14 @@ static void nibblesGenNewNumber(void) · 361 unmodified lines
362	362	x = rand() % 51;
363	363	y = rand() % 23;
364	364
365		− if (NI_Screen[x][y] == 0 && NI_Screen[x][y+1] == 0)
	365	+ bool blockIsSuitable;
	366	+
	367	+ if (y < 22)
	368	+ blockIsSuitable = NI_Screen[x][y] == 0 && NI_Screen[x][y+1] == 0;
	369	+ else
	370	+ blockIsSuitable = NI_Screen[x][y] == 0; // FT2 bugfix: prevent look-up overflow
	371	+
	372	+ if (blockIsSuitable)
366	373	{
367	374	NI_Number++;
368	375	NI_Screen[x][y] = (uint8_t)(16 + NI_Number);

src/ft2_radiobuttons.c+6−6

@@ -74,21 +74,21 @@ radioButton_t radioButtons[NUM_RADIOBUTTONS] = · 73 unmodified lines
74	74	// ------ CONFIG AUDIO ------
75	75
76	76	// audio buffer size
77		− //x, y, w, group, funcOnUp
	77	+ //x, y, w, group, funcOnUp
78	78	{ 390, 16, 46, RB_GROUP_CONFIG_SOUND_BUFF_SIZE, rbConfigSbs512 },
79	79	{ 390, 30, 113, RB_GROUP_CONFIG_SOUND_BUFF_SIZE, rbConfigSbs1024 },
80	80	{ 390, 44, 50, RB_GROUP_CONFIG_SOUND_BUFF_SIZE, rbConfigSbs2048 },
81	81
82	82	// audio bit depth
83		− //x, y, w, group, funcOnUp
	83	+ //x, y, w, group, funcOnUp
84	84	{ 390, 74, 107, RB_GROUP_CONFIG_AUDIO_BIT_DEPTH, rbConfigAudio16bit },
85	85	{ 390, 88, 83, RB_GROUP_CONFIG_AUDIO_BIT_DEPTH, rbConfigAudio24bit },
86	86
87	87	// audio interpolation
88		− //x, y, w, group, funcOnUp
89		− { 390, 117, 46, RB_GROUP_CONFIG_AUDIO_INTERPOLATION, rbConfigAudioIntrpNone },
90		− { 390, 131, 91, RB_GROUP_CONFIG_AUDIO_INTERPOLATION, rbConfigAudioIntrpLinear },
91		− { 390, 145, 86, RB_GROUP_CONFIG_AUDIO_INTERPOLATION, rbConfigAudioIntrpCubic },
	88	+ //x, y, w, group, funcOnUp
	89	+ { 390, 117, 46, RB_GROUP_CONFIG_AUDIO_INTERPOLATION, rbConfigAudioIntrpNone },
	90	+ { 390, 131, 91, RB_GROUP_CONFIG_AUDIO_INTERPOLATION, rbConfigAudioIntrpLinear },
	91	+ { 390, 145, 103, RB_GROUP_CONFIG_AUDIO_INTERPOLATION, rbConfigAudioIntrpSinc },
92	92
93	93	// audio output frequency
94	94	//x, y, w, group, funcOnUp

src/ft2_radiobuttons.h+1−1

@@ -57,7 +57,7 @@ enum // RADIOBUTTONS · 56 unmodified lines
57	57	// AUDIO INTERPOLATION
58	58	RB_CONFIG_AUDIO_INTRP_NONE,
59	59	RB_CONFIG_AUDIO_INTRP_LINEAR,
60		− RB_CONFIG_AUDIO_INTRP_CUBIC,
	60	+ RB_CONFIG_AUDIO_INTRP_SINC,
61	61
62	62	// AUDIO FREQUENCY
63	63	RB_CONFIG_AUDIO_44KHZ,

src/ft2_replayer.c+71−85

@@ -20,7 +20,7 @@ · 19 unmodified lines
20	20	#include "ft2_sample_loader.h"
21	21	#include "ft2_tables.h"
22	22	#include "ft2_structs.h"
23		−#include "mixer/ft2_cubicspline.h"
	23	+#include "mixer/ft2_windowed_sinc.h"
24	24
25	25	/* This is a mess, directly ported from the original FT2 code (with some modifications).
26	26	** You will experience a lot of headaches if you dig into it...
@@ -101,7 +101,7 @@ void resetChannels(void) · 74 unmodified lines
101	101	{
102	102	stmTyp *ch = &stm[i];
103	103
104		− ch->instrSeg = instr[0];
	104	+ ch->instrPtr = instr[0];
105	105	ch->status = IS_Vol;
106	106	ch->oldPan = 128;
107	107	ch->outPan = 128;
@@ -293,8 +293,6 @@ static void retrigVolume(stmTyp *ch) · 185 unmodified lines
293	293
294	294	static void retrigEnvelopeVibrato(stmTyp *ch)
295	295	{
296		− instrTyp *ins;
297		−
298	296	if (!(ch->waveCtrl & 0x04)) ch->vibPos = 0;
299	297	if (!(ch->waveCtrl & 0x40)) ch->tremPos = 0;
300	298
@@ -303,7 +301,7 @@ static void retrigEnvelopeVibrato(stmTyp *ch) · 2 unmodified lines
303	301
304	302	ch->envSustainActive = true;
305	303
306		− ins = ch->instrSeg;
	304	+ instrTyp *ins = ch->instrPtr;
307	305	assert(ins != NULL);
308	306
309	307	if (ins->envVTyp & 1)
@@ -340,22 +338,20 @@ static void retrigEnvelopeVibrato(stmTyp *ch) · 30 unmodified lines
340	338
341	339	void keyOff(stmTyp *ch)
342	340	{
343		− instrTyp *ins;
344		−
345	341	ch->envSustainActive = false;
346	342
347		− ins = ch->instrSeg;
	343	+ instrTyp *ins = ch->instrPtr;
348	344	assert(ins != NULL);
349	345
350	346	if (!(ins->envPTyp & 1)) // yes, FT2 does this (!). Most likely a bug?
351	347	{
352		− if (ch->envPCnt >= ins->envPP[ch->envPPos][0])
	348	+ if (ch->envPCnt >= (uint16_t)ins->envPP[ch->envPPos][0])
353	349	ch->envPCnt = ins->envPP[ch->envPPos][0] - 1;
354	350	}
355	351
356	352	if (ins->envVTyp & 1)
357	353	{
358		− if (ch->envVCnt >= ins->envVP[ch->envVPos][0])
	354	+ if (ch->envVCnt >= (uint16_t)ins->envVP[ch->envVPos][0])
359	355	ch->envVCnt = ins->envVP[ch->envVPos][0] - 1;
360	356	}
361	357	else
@@ -379,11 +375,11 @@ void calcReplayRate(int32_t audioFreq) · 17 unmodified lines
379	375
380	376	dHz2MixDeltaMul = (double)MIXER_FRAC_SCALE / audioFreq;
381	377	audio.quickVolRampSamples = (int32_t)((audioFreq / 200.0) + 0.5); // rounded
382		− audio.fRampQuickVolMul = 1.0f / audio.quickVolRampSamples;
	378	+ audio.dRampQuickVolMul = 1.0 / audio.quickVolRampSamples;
383	379
384	380	audio.dSamplesPerTickTab[0] = 0.0;
385	381	audio.tickTimeTab[0] = UINT64_MAX;
386		− audio.fRampTickMulTab[0] = 0.0f;
	382	+ audio.dRampTickMulTab[0] = 0.0;
387	383
388	384	for (int32_t i = MIN_BPM; i <= MAX_BPM; i++)
389	385	{
@@ -402,7 +398,7 @@ void calcReplayRate(int32_t audioFreq) · 12 unmodified lines
402	398
403	399	// for calculating volume ramp length for tick-lenghted ramps
404	400	const int32_t samplesPerTick = (int32_t)(dSamplesPerTick + 0.5); // this has to be rounded first
405		− audio.fRampTickMulTab[i] = 1.0f / samplesPerTick;
	401	+ audio.dRampTickMulTab[i] = 1.0 / samplesPerTick;
406	402	}
407	403	}
408	404
@@ -415,11 +411,12 @@ int64_t getMixerDelta(uint16_t period) · 6 unmodified lines
415	411	{
416	412	/* Precision has been tested for most extreme case (Amiga period 1, 44100Hz),
417	413	** and there is no precision loss using 64-bit double-precision here, even
418		− ** though we can get very big numbers.
	414	+ ** though we can get VERY big numbers.
419	415	*/
420	416	return (int64_t)((dPeriod2Hz(period) * dHz2MixDeltaMul) + 0.5); // Hz -> rounded 32.32 fixed-point mixer delta
421	417	}
422	418
	419	+// used for calculating the max safe amount of samples to mix before entering inner mix loop
423	420	uint32_t getRevMixerDelta(uint16_t period)
424	421	{
425	422	return revMixDeltaTab[period];
@@ -467,7 +464,7 @@ static void startTone(uint8_t ton, uint8_t effTyp, uint8_t eff, stmTyp *ch) · 41 unmodified lines
467	464	if (ins == NULL)
468	465	ins = instr[0];
469	466
470		− ch->instrSeg = ins;
	467	+ ch->instrPtr = ins;
471	468	ch->mute = ins->mute;
472	469
473	470	if (ton > 96) // non-FT2 security (should never happen because I clamp in the patt. loader now)
@@ -742,7 +739,7 @@ static void setEnvelopePos(stmTyp *ch, uint8_t param) · 268 unmodified lines
742	739	bool envUpdate;
743	740	int16_t newEnvPos;
744	741
745		− instrTyp *ins = ch->instrSeg;
	742	+ instrTyp *ins = ch->instrPtr;
746	743	assert(ins != NULL);
747	744
748	745	// * VOLUME ENVELOPE *
@@ -776,10 +773,8 @@ static void setEnvelopePos(stmTyp *ch, uint8_t param) · 27 unmodified lines
776	773	break;
777	774	}
778	775
779		− ch->envVIPValue = ((ins->envVP[envPos+1][1] - ins->envVP[envPos][1]) & 0xFF) << 8;
780		− ch->envVIPValue /= (ins->envVP[envPos+1][0] - ins->envVP[envPos][0]);
781		−
782		− ch->envVAmp = (ch->envVIPValue * (newEnvPos - 1)) + ((ins->envVP[envPos][1] & 0xFF) << 8);
	776	+ ch->dEnvVIPValue = (double)(ins->envVP[envPos+1][1] - ins->envVP[envPos][1]) / (ins->envVP[envPos+1][0] - ins->envVP[envPos][0]);
	777	+ ch->dEnvVAmp = (ch->dEnvVIPValue * (newEnvPos - 1)) + (ins->envVP[envPos][1] & 0xFF);
783	778
784	779	envPos++;
785	780
@@ -796,8 +791,8 @@ static void setEnvelopePos(stmTyp *ch, uint8_t param) · 10 unmodified lines
796	791
797	792	if (envUpdate)
798	793	{
799		− ch->envVIPValue = 0;
800		− ch->envVAmp = (ins->envVP[envPos][1] & 0xFF) << 8;
	794	+ ch->dEnvVIPValue = 0.0;
	795	+ ch->dEnvVAmp = (double)(ins->envVP[envPos][1] & 0xFF);
801	796	}
802	797
803	798	if (envPos >= ins->envVPAnt)
@@ -841,10 +836,8 @@ static void setEnvelopePos(stmTyp *ch, uint8_t param) · 37 unmodified lines
841	836	break;
842	837	}
843	838
844		− ch->envPIPValue = ((ins->envPP[envPos+1][1] - ins->envPP[envPos][1]) & 0xFF) << 8;
845		− ch->envPIPValue /= (ins->envPP[envPos+1][0] - ins->envPP[envPos][0]);
846		−
847		− ch->envPAmp = (ch->envPIPValue * (newEnvPos - 1)) + ((ins->envPP[envPos][1] & 0xFF) << 8);
	839	+ ch->dEnvPIPValue = (double)(ins->envPP[envPos+1][1] - ins->envPP[envPos][1]) / (ins->envPP[envPos+1][0] - ins->envPP[envPos][0]);
	840	+ ch->dEnvPAmp = (ch->dEnvPIPValue * (newEnvPos - 1)) + (ins->envPP[envPos][1] & 0xFF);
848	841
849	842	envPos++;
850	843
@@ -861,8 +854,8 @@ static void setEnvelopePos(stmTyp *ch, uint8_t param) · 10 unmodified lines
861	854
862	855	if (envUpdate)
863	856	{
864		− ch->envPIPValue = 0;
865		− ch->envPAmp = (ins->envPP[envPos][1] & 0xFF) << 8;
	857	+ ch->dEnvPIPValue = 0.0;
	858	+ ch->dEnvPAmp = (double)(ins->envPP[envPos][1] & 0xFF);
866	859	}
867	860
868	861	if (envPos >= ins->envPPAnt)
@@ -1354,11 +1347,10 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 485 unmodified lines
1354	1347	bool envInterpolateFlag, envDidInterpolate;
1355	1348	uint8_t envPos;
1356	1349	int16_t autoVibVal;
1357		− uint16_t tmpPeriod, autoVibAmp, envVal;
1358		− float fVol;
1359		− instrTyp *ins;
	1350	+ uint16_t tmpPeriod, autoVibAmp;
	1351	+ double dVol, dEnvVal;
1360	1352
1361		− ins = ch->instrSeg;
	1353	+ instrTyp *ins = ch->instrPtr;
1362	1354	assert(ins != NULL);
1363	1355
1364	1356	// * FADEOUT *
@@ -1381,7 +1373,7 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 16 unmodified lines
1381	1373	if (!ch->mute)
1382	1374	{
1383	1375	// * VOLUME ENVELOPE *
1384		− envVal = 0;
	1376	+ dEnvVal = 0.0;
1385	1377	if (ins->envVTyp & 1)
1386	1378	{
1387	1379	envDidInterpolate = false;
@@ -1389,7 +1381,7 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 1 unmodified line
1389	1381
1390	1382	if (++ch->envVCnt == ins->envVP[envPos][0])
1391	1383	{
1392		− ch->envVAmp = ins->envVP[envPos][1] << 8;
	1384	+ ch->dEnvVAmp = ins->envVP[envPos][1];
1393	1385
1394	1386	envPos++;
1395	1387	if (ins->envVTyp & 4)
@@ -1402,7 +1394,7 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 6 unmodified lines
1402	1394	{
1403	1395	envPos = ins->envVRepS;
1404	1396	ch->envVCnt = ins->envVP[envPos][0];
1405		− ch->envVAmp = ins->envVP[envPos][1] << 8;
	1397	+ ch->dEnvVAmp = ins->envVP[envPos][1];
1406	1398	}
1407	1399	}
1408	1400
@@ -1417,7 +1409,7 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 8 unmodified lines
1417	1409	if (envPos-1 == ins->envVSust)
1418	1410	{
1419	1411	envPos--;
1420		− ch->envVIPValue = 0;
	1412	+ ch->dEnvVIPValue = 0.0;
1421	1413	envInterpolateFlag = false;
1422	1414	}
1423	1415	}
@@ -1426,66 +1418,65 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 2 unmodified lines
1426	1418	{
1427	1419	ch->envVPos = envPos;
1428	1420
1429		− ch->envVIPValue = 0;
	1421	+ ch->dEnvVIPValue = 0.0;
1430	1422	if (ins->envVP[envPos][0] > ins->envVP[envPos-1][0])
1431	1423	{
1432		− ch->envVIPValue = (ins->envVP[envPos][1] - ins->envVP[envPos-1][1]) << 8;
1433		− ch->envVIPValue /= (ins->envVP[envPos][0] - ins->envVP[envPos-1][0]);
	1424	+ ch->dEnvVIPValue = (double)(ins->envVP[envPos][1] - ins->envVP[envPos-1][1]) / (ins->envVP[envPos][0] - ins->envVP[envPos-1][0]);
1434	1425
1435		− envVal = ch->envVAmp;
	1426	+ dEnvVal = ch->dEnvVAmp;
1436	1427	envDidInterpolate = true;
1437	1428	}
1438	1429	}
1439	1430	}
1440	1431	else
1441	1432	{
1442		− ch->envVIPValue = 0;
	1433	+ ch->dEnvVIPValue = 0.0;
1443	1434	}
1444	1435	}
1445	1436
1446	1437	if (!envDidInterpolate)
1447	1438	{
1448		− ch->envVAmp += ch->envVIPValue;
	1439	+ ch->dEnvVAmp += ch->dEnvVIPValue;
1449	1440
1450		− envVal = ch->envVAmp;
1451		− if (envVal > 64*256)
	1441	+ dEnvVal = ch->dEnvVAmp;
	1442	+ if (dEnvVal > 64.0)
1452	1443	{
1453		− if (envVal > 128*256)
1454		− envVal = 64*256;
	1444	+ if (dEnvVal > 128.0)
	1445	+ dEnvVal = 64.0;
1455	1446	else
1456		− envVal = 0;
	1447	+ dEnvVal = 0.0;
1457	1448
1458		− ch->envVIPValue = 0;
	1449	+ ch->dEnvVIPValue = 0.0;
1459	1450	}
1460	1451	}
1461	1452
1462		− fVol = song.globVol * (1.0f / 64.0f);
1463		− fVol = ch->outVol (1.0f / 64.0f);
1464		− fVol = ch->fadeOutAmp (1.0f / 32768.0f);
1465		− fVol = envVal (1.0f / 16384.0f);
	1453	+ dVol = song.globVol * (1.0 / 64.0);
	1454	+ dVol = ch->outVol (1.0 / 64.0);
	1455	+ dVol = ch->fadeOutAmp (1.0 / 32768.0);
	1456	+ dVol = dEnvVal (1.0 / 64.0);
1466	1457
1467	1458	ch->status \|= IS_Vol; // update vol every tick because vol envelope is enabled
1468	1459	}
1469	1460	else
1470	1461	{
1471		− fVol = song.globVol * (1.0f / 64.0f);
1472		− fVol = ch->outVol (1.0f / 64.0f);
1473		− fVol = ch->fadeOutAmp (1.0f / 32768.0f);
	1462	+ dVol = song.globVol * (1.0 / 64.0);
	1463	+ dVol = ch->outVol (1.0 / 64.0);
	1464	+ dVol = ch->fadeOutAmp (1.0 / 32768.0);
1474	1465	}
1475	1466
1476		− if (fVol > 1.0f) // shouldn't happen, but just in case...
1477		− fVol = 1.0f;
	1467	+ if (dVol > 1.0) // shouldn't happen, but just in case...
	1468	+ dVol = 1.0;
1478	1469
1479		− ch->fFinalVol = fVol;
	1470	+ ch->dFinalVol = dVol;
1480	1471	}
1481	1472	else
1482	1473	{
1483		− ch->fFinalVol = 0.0f;
	1474	+ ch->dFinalVol = 0.0;
1484	1475	}
1485	1476
1486	1477	// * PANNING ENVELOPE *
1487	1478
1488		− envVal = 0;
	1479	+ dEnvVal = 0.0;
1489	1480	if (ins->envPTyp & 1)
1490	1481	{
1491	1482	envDidInterpolate = false;
@@ -1493,7 +1484,7 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 1 unmodified line
1493	1484
1494	1485	if (++ch->envPCnt == ins->envPP[envPos][0])
1495	1486	{
1496		− ch->envPAmp = ins->envPP[envPos][1] << 8;
	1487	+ ch->dEnvPAmp = ins->envPP[envPos][1];
1497	1488
1498	1489	envPos++;
1499	1490	if (ins->envPTyp & 4)
@@ -1507,7 +1498,7 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 7 unmodified lines
1507	1498	envPos = ins->envPRepS;
1508	1499
1509	1500	ch->envPCnt = ins->envPP[envPos][0];
1510		− ch->envPAmp = ins->envPP[envPos][1] << 8;
	1501	+ ch->dEnvPAmp = ins->envPP[envPos][1];
1511	1502	}
1512	1503	}
1513	1504
@@ -1522,7 +1513,7 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 8 unmodified lines
1522	1513	if (envPos-1 == ins->envPSust)
1523	1514	{
1524	1515	envPos--;
1525		− ch->envPIPValue = 0;
	1516	+ ch->dEnvPIPValue = 0.0;
1526	1517	envInterpolateFlag = false;
1527	1518	}
1528	1519	}
@@ -1531,42 +1522,41 @@ static void fixaEnvelopeVibrato(stmTyp *ch) · 2 unmodified lines
1531	1522	{
1532	1523	ch->envPPos = envPos;
1533	1524
1534		− ch->envPIPValue = 0;
	1525	+ ch->dEnvPIPValue = 0.0;
1535	1526	if (ins->envPP[envPos][0] > ins->envPP[envPos-1][0])
1536	1527	{
1537		− ch->envPIPValue = (ins->envPP[envPos][1] - ins->envPP[envPos-1][1]) << 8;
1538		− ch->envPIPValue /= (ins->envPP[envPos][0] - ins->envPP[envPos-1][0]);
	1528	+ ch->dEnvPIPValue = (double)(ins->envPP[envPos][1] - ins->envPP[envPos-1][1]) / (ins->envPP[envPos][0] - ins->envPP[envPos-1][0]);
1539	1529
1540		− envVal = ch->envPAmp;
	1530	+ dEnvVal = ch->dEnvPAmp;
1541	1531	envDidInterpolate = true;
1542	1532	}
1543	1533	}
1544	1534	}
1545	1535	else
1546	1536	{
1547		− ch->envPIPValue = 0;
	1537	+ ch->dEnvPIPValue = 0.0;
1548	1538	}
1549	1539	}
1550	1540
1551	1541	if (!envDidInterpolate)
1552	1542	{
1553		− ch->envPAmp += ch->envPIPValue;
	1543	+ ch->dEnvPAmp += ch->dEnvPIPValue;
1554	1544
1555		− envVal = ch->envPAmp;
1556		− if (envVal > 64*256)
	1545	+ dEnvVal = ch->dEnvPAmp;
	1546	+ if (dEnvVal > 64.0)
1557	1547	{
1558		− if (envVal > 128*256)
1559		− envVal = 64*256;
	1548	+ if (dEnvVal > 128.0)
	1549	+ dEnvVal = 64.0;
1560	1550	else
1561		− envVal = 0;
	1551	+ dEnvVal = 0.0;
1562	1552
1563		− ch->envPIPValue = 0;
	1553	+ ch->dEnvPIPValue = 0.0;
1564	1554	}
1565	1555	}
1566	1556
1567	1557	const int32_t panTmp = 128 - ABS(ch->outPan - 128);
1568		− const int32_t panEnv = (int32_t)envVal - (32*256); // -8192..7936
1569		− const int32_t panAdd = (int32_t)roundf((panTmp * panEnv) * (1.0f / 8192.0f)); // -128..124
	1558	+ const double dPanEnv = dEnvVal - 32.0;
	1559	+ const int32_t panAdd = (int32_t)round((panTmp * dPanEnv) * (1.0 / 32.0)); // -128..124
1570	1560	ch->finalPan = (uint8_t)CLAMP(ch->outPan + panAdd, 0, 255);
1571	1561
1572	1562	ch->status \|= IS_Pan; // update pan every tick because pan envelope is enabled
@@ -2809,7 +2799,7 @@ void closeReplayer(void) · 1236 unmodified lines
2809	2799	instr[131] = NULL;
2810	2800	}
2811	2801
2812		− freeCubicTable();
	2802	+ freeWindowedSincTables();
2813	2803	}
2814	2804
2815	2805	bool setupReplayer(void)
@@ -2839,7 +2829,7 @@ bool setupReplayer(void) · 23 unmodified lines
2839	2829	audio.linearFreqTable = true;
2840	2830	note2Period = linearPeriods;
2841	2831
2842		− calcCubicTable();
	2832	+ calcWindowedSincTables();
2843	2833	calcPeriod2HzTable();
2844	2834	calcRevMixDeltaTable();
2845	2835	calcPanningTable();
@@ -2916,10 +2906,6 @@ void stopPlaying(void) · 70 unmodified lines
2916	2906	// safely kills all voices
2917	2907	lockMixerCallback();
2918	2908	unlockMixerCallback();
2919		−
2920		− // prevent getFrequenceValue() from calculating the rates forever
2921		− for (i = 0; i < MAX_VOICES; i++)
2922		− stm[i].outPeriod = 0;
2923	2909	}
2924	2910	else
2925	2911	{
@@ -3154,12 +3140,12 @@ void stopVoices(void) · 228 unmodified lines
3154	3140	ch->tonTyp = 0;
3155	3141	ch->relTonNr = 0;
3156	3142	ch->instrNr = 0;
3157		− ch->instrSeg = instr[0]; // important: set instrument pointer to instr 0 (placeholder instrument)
	3143	+ ch->instrPtr = instr[0]; // important: set instrument pointer to instr 0 (placeholder instrument)
3158	3144	ch->status = IS_Vol;
3159	3145	ch->realVol = 0;
3160	3146	ch->outVol = 0;
3161	3147	ch->oldVol = 0;
3162		− ch->fFinalVol = 0.0f;
	3148	+ ch->dFinalVol = 0.0;
3163	3149	ch->oldPan = 128;
3164	3150	ch->outPan = 128;
3165	3151	ch->finalPan = 128;

src/ft2_replayer.h+9−10

@@ -3,9 +3,7 @@ · 2 unmodified lines
3	3	#include <stdint.h>
4	4	#include <stdbool.h>
5	5	#include "ft2_unicode.h"
6		−
7		−// cubic spline requires 2 extra samples in the future to be read
8		−#define NUM_FIXED_TAP_SAMPLES 2
	6	+#include "mixer/ft2_windowed_sinc.h"
9	7
10	8	enum
11	9	{
@@ -175,7 +173,8 @@ typedef struct sampleTyp_t · 163 unmodified lines
175	173	bool fixed;
176	174	int8_t fine, relTon, pek, origPek;
177	175	uint8_t vol, typ, pan;
178		− int16_t fixedSmp[NUM_FIXED_TAP_SAMPLES];
	176	+ double dLeftEdgeTapSamples[8+3];
	177	+ int16_t fixedSmp[SINC_RIGHT_TAPS];
179	178	int32_t fixedPos, len, repS, repL;
180	179	} sampleTyp;
181	180
@@ -207,14 +206,14 @@ typedef struct stmTyp_t · 25 unmodified lines
207	206	uint8_t portaUpSpeed, portaDownSpeed, retrigSpeed, retrigCnt, retrigVol;
208	207	uint8_t volKolVol, tonNr, envPPos, eVibPos, envVPos, realVol, oldVol, outVol;
209	208	uint8_t oldPan, outPan, finalPan;
210		− int16_t midiPitch, envVIPValue, envPIPValue;
	209	+ int16_t midiPitch;
211	210	uint16_t outPeriod, realPeriod, finalPeriod, tonTyp, wantPeriod, portaSpeed;
212		− uint16_t envVCnt, envVAmp, envPCnt, envPAmp, eVibAmp, eVibSweep;
	211	+ uint16_t envVCnt, envPCnt, eVibAmp, eVibSweep;
213	212	uint16_t fadeOutAmp, fadeOutSpeed, midiVibDepth;
214		− float fFinalVol;
215		− int32_t smpStartPos;
	213	+ double dEnvVIPValue, dEnvPIPValue, dEnvVAmp, dEnvPAmp, dFinalVol;
	214	+ int32_t oldFinalPeriod, smpStartPos;
216	215	sampleTyp *smpPtr;
217		− instrTyp *instrSeg;
	216	+ instrTyp *instrPtr;
218	217	} stmTyp;
219	218
220	219	typedef struct songTyp_t
@@ -241,7 +240,7 @@ typedef struct syncedChannel_t // used for audio/video sync queue · 20 unmodified lines
241	240	uint8_t status, sampleNr, instrNr;
242	241	uint16_t finalPeriod;
243	242	int32_t smpStartPos;
244		− float fFinalVol;
	243	+ double dFinalVol;
245	244	} syncedChannel_t;
246	245
247	246	void setNewSongPos(int32_t pos);

src/ft2_sample_ed.c+225−35

@@ -27,6 +27,7 @@ · 26 unmodified lines
27	27	#include "ft2_diskop.h"
28	28	#include "ft2_keyboard.h"
29	29	#include "ft2_structs.h"
	30	+#include "mixer/ft2_windowed_sinc.h" // SINC_TAPS, SINC_NEGATIVE_TAPS
30	31
31	32	static const char sharpNote1Char[12] = { 'C', 'C', 'D', 'D', 'E', 'F', 'F', 'G', 'G', 'A', 'A', 'B' };
32	33	static const char sharpNote2Char[12] = { '-', '#', '-', '#', '-', '-', '#', '-', '#', '-', '#', '-' };
@@ -57,6 +58,9 @@ sampleTyp *getCurSample(void) · 24 unmodified lines
57	58	// modifies samples before index 0, and after loop/end (for branchless mixer interpolation (kinda))
58	59	void fixSample(sampleTyp *s)
59	60	{
	61	+ int32_t pos;
	62	+ bool backwards;
	63	+
60	64	assert(s != NULL);
61	65	if (s->origPek == NULL \|\| s->pek == NULL)
62	66	{
@@ -88,37 +92,46 @@ void fixSample(sampleTyp *s) · 25 unmodified lines
88	92	return; // empty sample
89	93	}
90	94
91		− // disable loop if loopLen == 0 (FT2 does this)
92		− if (loopType != 0 && loopLen == 0)
	95	+ // treat loop as disabled if loopLen == 0 (FT2 does this)
	96	+ if (loopType != 0 && loopLen <= 0)
93	97	{
94	98	loopType = 0;
95	99	loopStart = loopLen = loopEnd = 0;
96	100	}
97	101
98		− /* The first and second tap (-1, 0) should be the same at sampling position #0
99		− ** (at sample trigger), until an eventual loop cycle, where the -1 tap has a
100		− ** special case in the mixer.
	102	+ /* All negative taps should be equal to the first sample point when at sampling
	103	+ ** position #0 (on sample trigger), until an eventual loop cycle, where we do
	104	+ ** a special left edge case with replaced tap data.
	105	+ ** The sample pointer is offset and has allocated data before it, so this is
	106	+ ** safe.
101	107	*/
102	108	if (sample16Bit)
103		− ptr16[-1] = ptr16[0];
	109	+ {
	110	+ for (int32_t i = 0; i < SINC_LEFT_TAPS; i++)
	111	+ ptr16[i-SINC_LEFT_TAPS] = ptr16[0];
	112	+ }
104	113	else
105		− s->pek[-1] = s->pek[0];
	114	+ {
	115	+ for (int32_t i = 0; i < SINC_LEFT_TAPS; i++)
	116	+ s->pek[i-SINC_LEFT_TAPS] = s->pek[0];
	117	+ }
106	118
	119	+ // no loop
107	120	if (loopType == 0)
108	121	{
109		− // no loop
110	122	if (sample16Bit)
111	123	{
112		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	124	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
113	125	ptr16[len+i] = ptr16[len-1];
114	126	}
115	127	else
116	128	{
117		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	129	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
118	130	s->pek[len+i] = s->pek[len-1];
119	131	}
120	132
121		− s->fixedPos = 0;
	133	+ s->fixedPos = 0; // this value is not used for non-looping samples, set to zero
	134	+
122	135	s->fixed = false; // no fixed samples inside actual sample data
123	136	return;
124	137	}
@@ -126,13 +139,18 @@ void fixSample(sampleTyp *s) · 1 unmodified line
126	139	if (s->fixed)
127	140	return; // already fixed
128	141
129		− s->fixedPos = loopStart + loopLen;
	142	+ s->fixedPos = loopEnd;
	143	+ s->fixed = true;
130	144
131		− if (loopLen == 1) // too short for interpolation kernel size, fix in a different way
	145	+ // special-case for loop-lengt of 1
	146	+ if (loopLen == 1)
132	147	{
133	148	if (sample16Bit)
134	149	{
135		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	150	+ for (int32_t i = 0; i < SINC_TAPS+SINC_LEFT_TAPS; i++)
	151	+ s->dLeftEdgeTapSamples[i] = ptr16[loopStart];
	152	+
	153	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
136	154	{
137	155	s->fixedSmp[i] = ptr16[loopEnd+i];
138	156	ptr16[loopEnd+i] = ptr16[loopStart];
@@ -140,14 +158,16 @@ void fixSample(sampleTyp *s) · 1 unmodified line
140	158	}
141	159	else
142	160	{
143		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	161	+ for (int32_t i = 0; i < SINC_TAPS+SINC_LEFT_TAPS; i++)
	162	+ s->dLeftEdgeTapSamples[i] = s->pek[loopStart];
	163	+
	164	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
144	165	{
145	166	s->fixedSmp[i] = s->pek[loopEnd+i];
146	167	s->pek[loopEnd+i] = s->pek[loopStart];
147	168	}
148	169	}
149	170
150		− s->fixed = true;
151	171	return;
152	172	}
153	173
@@ -156,18 +176,54 @@ void fixSample(sampleTyp *s) · 2 unmodified lines
156	176	// forward loop
157	177	if (sample16Bit)
158	178	{
159		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	179	+ // left edge (we need SINC_LEFT_TAPS amount of extra unrolled samples)
	180	+ for (int32_t i = 0; i < SINC_TAPS+SINC_LEFT_TAPS; i++)
	181	+ {
	182	+ if (i < SINC_LEFT_TAPS) // negative taps
	183	+ {
	184	+ pos = loopEnd-i;
	185	+ if (pos <= loopStart) // XXX: Correct?
	186	+ pos += loopLen;
	187	+ }
	188	+ else // positive taps
	189	+ {
	190	+ pos = loopStart + ((i-SINC_LEFT_TAPS) % loopLen);
	191	+ }
	192	+
	193	+ s->dLeftEdgeTapSamples[i] = ptr16[pos];
	194	+ }
	195	+
	196	+ // right edge (change actual sample data since data after loop is never used)
	197	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
160	198	{
161	199	s->fixedSmp[i] = ptr16[loopEnd+i];
162		− ptr16[loopEnd+i] = ptr16[loopStart+i];
	200	+ ptr16[loopEnd+i] = ptr16[loopStart + (i % loopLen)];
163	201	}
164	202	}
165	203	else
166	204	{
167		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	205	+ // left edge (we need SINC_LEFT_TAPS amount of extra unrolled samples)
	206	+ for (int32_t i = 0; i < SINC_TAPS+SINC_LEFT_TAPS; i++)
	207	+ {
	208	+ if (i < SINC_LEFT_TAPS) // negative taps
	209	+ {
	210	+ pos = loopEnd-i;
	211	+ if (pos <= loopStart) // XXX: Correct?
	212	+ pos += loopLen;
	213	+ }
	214	+ else // positive taps
	215	+ {
	216	+ pos = loopStart + ((i-SINC_LEFT_TAPS) % loopLen);
	217	+ }
	218	+
	219	+ s->dLeftEdgeTapSamples[i] = s->pek[pos];
	220	+ }
	221	+
	222	+ // right edge (change actual sample data since data after loop is never used)
	223	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
168	224	{
169	225	s->fixedSmp[i] = s->pek[loopEnd+i];
170		− s->pek[loopEnd+i] = s->pek[loopStart+i];
	226	+ s->pek[loopEnd+i] = s->pek[loopStart + (i % loopLen)];
171	227	}
172	228	}
173	229	}
@@ -176,25 +232,159 @@ void fixSample(sampleTyp *s) · 2 unmodified lines
176	232	// pingpong loop
177	233	if (sample16Bit)
178	234	{
179		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	235	+ // left edge (we need SINC_LEFT_TAPS amount of extra unrolled samples)
	236	+ pos = loopStart;
	237	+ backwards = false;
	238	+ for (int32_t i = 0; i < SINC_LEFT_TAPS; i++)
	239	+ {
	240	+ if (backwards)
	241	+ {
	242	+ if (--pos < loopStart)
	243	+ {
	244	+ pos = loopStart;
	245	+ backwards = false;
	246	+ }
	247	+ }
	248	+ else
	249	+ {
	250	+ if (++pos >= loopEnd)
	251	+ {
	252	+ pos = loopEnd-1;
	253	+ backwards = true;
	254	+ }
	255	+ }
	256	+
	257	+ s->dLeftEdgeTapSamples[3-i] = ptr16[pos];
	258	+ }
	259	+
	260	+ pos = loopStart;
	261	+ backwards = true;
	262	+ for (int32_t i = 3; i < SINC_TAPS+SINC_LEFT_TAPS; i++)
	263	+ {
	264	+ if (backwards)
	265	+ {
	266	+ if (--pos < loopStart)
	267	+ {
	268	+ pos = loopStart;
	269	+ backwards = false;
	270	+ }
	271	+ }
	272	+ else
	273	+ {
	274	+ if (++pos >= loopEnd)
	275	+ {
	276	+ pos = loopEnd-1;
	277	+ backwards = true;
	278	+ }
	279	+ }
	280	+
	281	+ s->dLeftEdgeTapSamples[i] = ptr16[pos];
	282	+ }
	283	+
	284	+ // right edge (change actual sample data since data after loop is never used)
	285	+ pos = loopEnd-1;
	286	+ backwards = true;
	287	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
180	288	{
181	289	s->fixedSmp[i] = ptr16[loopEnd+i];
182		− ptr16[loopEnd+i] = ptr16[loopEnd-1-i];
	290	+
	291	+ ptr16[loopEnd+i] = ptr16[pos];
	292	+ if (backwards)
	293	+ {
	294	+ if (--pos < loopStart)
	295	+ {
	296	+ pos = loopStart;
	297	+ backwards = false;
	298	+ }
	299	+ }
	300	+ else
	301	+ {
	302	+ if (++pos >= loopEnd)
	303	+ {
	304	+ pos = loopEnd-1;
	305	+ backwards = true;
	306	+ }
	307	+ }
183	308	}
184	309	}
185	310	else
186	311	{
187		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	312	+ // left edge (we need SINC_LEFT_TAPS amount of extra unrolled samples)
	313	+ pos = loopStart;
	314	+ backwards = false;
	315	+ for (int32_t i = 0; i < SINC_LEFT_TAPS; i++)
	316	+ {
	317	+ if (backwards)
	318	+ {
	319	+ if (--pos < loopStart)
	320	+ {
	321	+ pos = loopStart;
	322	+ backwards = false;
	323	+ }
	324	+ }
	325	+ else
	326	+ {
	327	+ if (++pos >= loopEnd)
	328	+ {
	329	+ pos = loopEnd-1;
	330	+ backwards = true;
	331	+ }
	332	+ }
	333	+
	334	+ s->dLeftEdgeTapSamples[3-i] = s->pek[pos];
	335	+ }
	336	+
	337	+ pos = loopStart;
	338	+ backwards = true;
	339	+ for (int32_t i = 3; i < SINC_TAPS+SINC_LEFT_TAPS; i++)
	340	+ {
	341	+ if (backwards)
	342	+ {
	343	+ if (--pos < loopStart)
	344	+ {
	345	+ pos = loopStart;
	346	+ backwards = false;
	347	+ }
	348	+ }
	349	+ else
	350	+ {
	351	+ if (++pos >= loopEnd)
	352	+ {
	353	+ pos = loopEnd-1;
	354	+ backwards = true;
	355	+ }
	356	+ }
	357	+
	358	+ s->dLeftEdgeTapSamples[i] = s->pek[pos];
	359	+ }
	360	+
	361	+ // right edge (change actual sample data since data after loop is never used)
	362	+ pos = loopEnd-1;
	363	+ backwards = true;
	364	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
188	365	{
189	366	s->fixedSmp[i] = s->pek[loopEnd+i];
190		− s->pek[loopEnd+i] = s->pek[loopEnd-1-i];
	367	+
	368	+ s->pek[loopEnd+i] = s->pek[pos];
	369	+ if (backwards)
	370	+ {
	371	+ if (--pos < loopStart)
	372	+ {
	373	+ pos = loopStart;
	374	+ backwards = false;
	375	+ }
	376	+ }
	377	+ else
	378	+ {
	379	+ if (++pos >= loopEnd)
	380	+ {
	381	+ pos = loopEnd-1;
	382	+ backwards = true;
	383	+ }
	384	+ }
191	385	}
192	386	}
193	387	}
194		−
195		− // -1 tap (right before loopStart) on forward/pingpong loops are handled in the mixer
196		−
197		− s->fixed = true;
198	388	}
199	389
200	390	// restores interpolation tap samples after loop/end
@@ -208,14 +398,14 @@ void restoreSample(sampleTyp *s) · 7 unmodified lines
208	398	{
209	399	// 16-bit sample
210	400	int16_t ptr16 = (int16_t )s->pek + s->fixedPos;
211		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	401	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
212	402	ptr16[i] = s->fixedSmp[i];
213	403	}
214	404	else
215	405	{
216	406	// 8-bit sample
217	407	int8_t *ptr8 = s->pek + s->fixedPos;
218		− for (int32_t i = 0; i < NUM_FIXED_TAP_SAMPLES; i++)
	408	+ for (int32_t i = 0; i < SINC_RIGHT_TAPS; i++)
219	409	ptr8[i] = (int8_t)s->fixedSmp[i];
220	410	}
221	411
@@ -594,7 +784,7 @@ static int8_t getScaledSample(sampleTyp *s, int32_t index) // for drawing sample · 372 unmodified lines
594	784	ptr16 = (int16_t *)s->pek;
595	785
596	786	// don't read fixed mixer interpolation samples, read the prestine ones instead
597		− if (index >= s->fixedPos && index < s->fixedPos+NUM_FIXED_TAP_SAMPLES && s->len > loopEnd && s->fixed)
	787	+ if (index >= s->fixedPos && index < s->fixedPos+SINC_RIGHT_TAPS && s->len > loopEnd && s->fixed)
598	788	tmp32 = s->fixedSmp[index-s->fixedPos];
599	789	else
600	790	tmp32 = ptr16[index];
@@ -604,7 +794,7 @@ static int8_t getScaledSample(sampleTyp *s, int32_t index) // for drawing sample · 3 unmodified lines
604	794	else
605	795	{
606	796	// don't read fixed mixer interpolation samples, read the prestine ones instead
607		− if (index >= s->fixedPos && index < s->fixedPos+NUM_FIXED_TAP_SAMPLES && s->len > loopEnd && s->fixed)
	797	+ if (index >= s->fixedPos && index < s->fixedPos+SINC_RIGHT_TAPS && s->len > loopEnd && s->fixed)
608	798	tmp32 = s->fixedSmp[index-s->fixedPos];
609	799	else
610	800	tmp32 = s->pek[index];
@@ -897,7 +1087,7 @@ static void getSpecialMinMax16(sampleTyp *s, int32_t index, int32_t scanEnd, int · 286 unmodified lines
897	1087	}
898	1088
899	1089	// read fixed samples
900		− int32_t tmpScanEnd = index+NUM_FIXED_TAP_SAMPLES;
	1090	+ int32_t tmpScanEnd = index+SINC_RIGHT_TAPS;
901	1091	if (tmpScanEnd > scanEnd)
902	1092	tmpScanEnd = scanEnd;
903	1093
@@ -939,7 +1129,7 @@ static void getSpecialMinMax8(sampleTyp *s, int32_t index, int32_t scanEnd, int8 · 35 unmodified lines
939	1129	}
940	1130
941	1131	// read fixed samples
942		− int32_t tmpScanEnd = index+NUM_FIXED_TAP_SAMPLES;
	1132	+ int32_t tmpScanEnd = index+SINC_RIGHT_TAPS;
943	1133	if (tmpScanEnd > scanEnd)
944	1134	tmpScanEnd = scanEnd;
945	1135
@@ -989,7 +1179,7 @@ static void getSampleDataPeak(sampleTyp *s, int32_t index, int32_t numSamples, i · 43 unmodified lines
989	1179	/* If the scan area is including the fixed samples (for branchless mixer interpolation),
990	1180	** do a special procedure to scan the original non-touched samples when needed.
991	1181	*/
992		− const bool insideRange = index >= s->fixedPos && index < s->fixedPos+NUM_FIXED_TAP_SAMPLES;
	1182	+ const bool insideRange = index >= s->fixedPos && index < s->fixedPos+SINC_RIGHT_TAPS;
993	1183	if (insideRange \|\| (index < s->fixedPos && scanEnd >= s->fixedPos))
994	1184	{
995	1185	if (s->typ & 16)

src/ft2_sample_saver.c+1−1

@@ -70,7 +70,7 @@ static void fileRestoreFixedSampleData(UNICHAR *filenameU, uint32_t sampleDataOf · 69 unmodified lines
70	70	if (fixedPos >= (uint32_t)s->len)
71	71	return;
72	72
73		− uint32_t bytesToWrite = NUM_FIXED_TAP_SAMPLES * (sample16Bit+1);
	73	+ uint32_t bytesToWrite = SINC_RIGHT_TAPS * (sample16Bit+1);
74	74	if (fixedPos+bytesToWrite > (uint32_t)s->len)
75	75	bytesToWrite = s->len - fixedPos;
76	76

src/ft2_scopes.c+2−2

@@ -99,7 +99,7 @@ static void setChannel(int32_t nr, bool on) · 98 unmodified lines
99	99	ch->realVol = 0;
100	100	ch->outVol = 0;
101	101	ch->oldVol = 0;
102		− ch->fFinalVol = 0.0f;
	102	+ ch->dFinalVol = 0.0;
103	103	ch->outPan = 128;
104	104	ch->oldPan = 128;
105	105	ch->finalPan = 128;
@@ -533,7 +533,7 @@ void handleScopesFromChQueue(chSyncData_t chSyncData, uint8_t scopeUpdateStatu · 427 unmodified lines
533	533	status = scopeUpdateStatus[i];
534	534
535	535	if (status & IS_Vol)
536		− sc->vol = (int32_t)((ch->fFinalVol * SCOPE_HEIGHT) + 0.5f); // rounded
	536	+ sc->vol = (int32_t)((ch->dFinalVol * SCOPE_HEIGHT) + 0.5); // rounded
537	537
538	538	if (status & IS_Period)
539	539	{

src/ft2_trim.c+1−1

@@ -256,7 +256,7 @@ static void wipeInstrUnused(bool testWipeSize, int16_t *ai, int32_t ap, int32_t · 255 unmodified lines
256	256	memcpy(tmpInst, &instr[1], MAX_INST * sizeof (instr[0]));
257	257
258	258	memset(&instr[1], 0, numInsts * sizeof (instr[0]));
259		− memset(song.instrName[1], 0, numInsts * sizeof (song.instrName[0]));
	259	+ memset(song.instrName[1], 0, numInsts * sizeof (song.instrName[0])); // XXX: Is this safe?
260	260
261	261	for (i = 0; i < numInsts; i++)
262	262	{

src/helpdata/FT2.HLP+1−1

@@ -785,7 +785,7 @@ you exit the program. · 784 unmodified lines
785	785	Selects what type of resampling interpolation to use.
786	786	"None" uses no interpolation (nearest neighbor), which will result in
787	787	aliasing (noise) in the sound. "Linear" is what real FT2 uses, which is a
788		−mediocre interpolation type. "Cubic spline" is the recommended setting
	788	+mediocre interpolation type. "Windowed-sinc" is the recommended setting
789	789	for the best audio quality, although it may sometimes sound too filtered
790	790	on low-quality samples (f.ex. Amiga MODs).
791	791

src/helpdata/ft2_help_data.h+440−440

@@ -3,9 +3,9 @@ · 2 unmodified lines
3	3
4	4	#include <stdint.h>
5	5
6		−#define HELP_DATA_LEN 26983
	6	+#define HELP_DATA_LEN 26984
7	7
8		−const uint8_t helpData[26983] =
	8	+const uint8_t helpData[26984] =
9	9	{
10	10	0x4C,0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
11	11	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
@@ -1793,469 +1793,469 @@ const uint8_t helpData[26983] = · 1781 unmodified lines
1793	1793	0x20,0x22,0x4C,0x69,0x6E,0x65,0x61,0x72,0x22,0x20,0x69,0x73,
1794	1794	0x20,0x77,0x68,0x61,0x74,0x20,0x72,0x65,0x61,0x6C,0x20,0x46,
1795	1795	0x54,0x32,0x20,0x75,0x73,0x65,0x73,0x2C,0x20,0x77,0x68,0x69,
1796		− 0x63,0x68,0x20,0x69,0x73,0x20,0x61,0x46,0x6D,0x65,0x64,0x69,
	1796	+ 0x63,0x68,0x20,0x69,0x73,0x20,0x61,0x47,0x6D,0x65,0x64,0x69,
1797	1797	0x6F,0x63,0x72,0x65,0x20,0x69,0x6E,0x74,0x65,0x72,0x70,0x6F,
1798	1798	0x6C,0x61,0x74,0x69,0x6F,0x6E,0x20,0x74,0x79,0x70,0x65,0x2E,
1799		− 0x20,0x22,0x43,0x75,0x62,0x69,0x63,0x20,0x73,0x70,0x6C,0x69,
1800		− 0x6E,0x65,0x22,0x20,0x69,0x73,0x20,0x74,0x68,0x65,0x20,0x72,
1801		− 0x65,0x63,0x6F,0x6D,0x6D,0x65,0x6E,0x64,0x65,0x64,0x20,0x73,
1802		− 0x65,0x74,0x74,0x69,0x6E,0x67,0x48,0x66,0x6F,0x72,0x20,0x74,
1803		− 0x68,0x65,0x20,0x62,0x65,0x73,0x74,0x20,0x61,0x75,0x64,0x69,
1804		− 0x6F,0x20,0x71,0x75,0x61,0x6C,0x69,0x74,0x79,0x2C,0x20,0x61,
1805		− 0x6C,0x74,0x68,0x6F,0x75,0x67,0x68,0x20,0x69,0x74,0x20,0x6D,
1806		− 0x61,0x79,0x20,0x73,0x6F,0x6D,0x65,0x74,0x69,0x6D,0x65,0x73,
1807		− 0x20,0x73,0x6F,0x75,0x6E,0x64,0x20,0x74,0x6F,0x6F,0x20,0x66,
1808		− 0x69,0x6C,0x74,0x65,0x72,0x65,0x64,0x2A,0x6F,0x6E,0x20,0x6C,
1809		− 0x6F,0x77,0x2D,0x71,0x75,0x61,0x6C,0x69,0x74,0x79,0x20,0x73,
1810		− 0x61,0x6D,0x70,0x6C,0x65,0x73,0x20,0x28,0x66,0x2E,0x65,0x78,
1811		− 0x2E,0x20,0x41,0x6D,0x69,0x67,0x61,0x20,0x4D,0x4F,0x44,0x73,
1812		− 0x29,0x2E,0x00,0x1A,0x3E,0x40,0x58,0x30,0x34,0x30,0x40,0x43,
1813		− 0x30,0x30,0x31,0x56,0x6F,0x6C,0x75,0x6D,0x65,0x20,0x72,0x61,
1814		− 0x6D,0x70,0x69,0x6E,0x67,0x3A,0x0B,0x3E,0x40,0x58,0x30,0x36,
1815		− 0x30,0x40,0x43,0x30,0x30,0x32,0x3B,0x45,0x6E,0x61,0x62,0x6C,
1816		− 0x65,0x73,0x20,0x74,0x68,0x65,0x20,0x61,0x6E,0x74,0x69,0x2D,
1817		− 0x63,0x6C,0x69,0x63,0x6B,0x20,0x73,0x79,0x73,0x74,0x65,0x6D,
1818		− 0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x61,0x75,0x64,0x69,
1819		− 0x6F,0x20,0x6D,0x69,0x78,0x65,0x72,0x20,0x28,0x46,0x54,0x32,
1820		− 0x2E,0x30,0x38,0x2B,0x29,0x2E,0x3B,0x50,0x6C,0x65,0x61,0x73,
1821		− 0x65,0x20,0x6E,0x6F,0x74,0x65,0x20,0x74,0x68,0x61,0x74,0x20,
1822		− 0x6F,0x72,0x69,0x67,0x69,0x6E,0x61,0x6C,0x20,0x46,0x54,0x32,
1823		− 0x20,0x63,0x61,0x6E,0x27,0x74,0x20,0x6C,0x6F,0x61,0x64,0x20,
1824		− 0x74,0x68,0x69,0x73,0x20,0x63,0x6F,0x6E,0x66,0x69,0x67,0x20,
1825		− 0x65,0x6E,0x74,0x72,0x79,0x2C,0x0B,0x63,0x6C,0x6F,0x6E,0x65,
1826		− 0x20,0x6F,0x6E,0x6C,0x79,0x2E,0x00,0x19,0x3E,0x40,0x58,0x30,
1827		− 0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x41,0x6D,0x70,0x6C,0x69,
1828		− 0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x3A,0x0B,0x3E,0x40,
1829		− 0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x46,0x41,0x6D,
1830		− 0x70,0x6C,0x69,0x66,0x69,0x65,0x73,0x20,0x74,0x68,0x65,0x20,
1831		− 0x76,0x6F,0x6C,0x75,0x6D,0x65,0x20,0x77,0x68,0x65,0x6E,0x20,
1832		− 0x6D,0x69,0x78,0x69,0x6E,0x67,0x2E,0x20,0x49,0x66,0x20,0x79,
1833		− 0x6F,0x75,0x20,0x73,0x65,0x74,0x20,0x74,0x68,0x69,0x73,0x20,
1834		− 0x6F,0x6E,0x65,0x20,0x74,0x6F,0x6F,0x20,0x68,0x69,0x67,0x68,
1835		− 0x2C,0x20,0x79,0x6F,0x75,0x27,0x6C,0x6C,0x3A,0x67,0x65,0x74,
1836		− 0x20,0x64,0x69,0x73,0x74,0x6F,0x72,0x74,0x69,0x6F,0x6E,0x2E,
1837		− 0x20,0x33,0x32,0x58,0x20,0x65,0x71,0x75,0x61,0x6C,0x73,0x20,
1838		− 0x66,0x75,0x6C,0x6C,0x20,0x61,0x6D,0x70,0x6C,0x69,0x74,0x75,
1839		− 0x64,0x65,0x20,0x66,0x6F,0x72,0x20,0x6F,0x6E,0x65,0x20,0x63,
1840		− 0x68,0x61,0x6E,0x6E,0x65,0x6C,0x2E,0x00,0x1B,0x3E,0x40,0x58,
1841		− 0x30,0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x46,0x72,0x65,0x71,
1842		− 0x75,0x65,0x6E,0x63,0x79,0x20,0x74,0x61,0x62,0x6C,0x65,0x3A,
	1799	+ 0x20,0x22,0x57,0x69,0x6E,0x64,0x6F,0x77,0x65,0x64,0x2D,0x73,
	1800	+ 0x69,0x6E,0x63,0x22,0x20,0x69,0x73,0x20,0x74,0x68,0x65,0x20,
	1801	+ 0x72,0x65,0x63,0x6F,0x6D,0x6D,0x65,0x6E,0x64,0x65,0x64,0x20,
	1802	+ 0x73,0x65,0x74,0x74,0x69,0x6E,0x67,0x48,0x66,0x6F,0x72,0x20,
	1803	+ 0x74,0x68,0x65,0x20,0x62,0x65,0x73,0x74,0x20,0x61,0x75,0x64,
	1804	+ 0x69,0x6F,0x20,0x71,0x75,0x61,0x6C,0x69,0x74,0x79,0x2C,0x20,
	1805	+ 0x61,0x6C,0x74,0x68,0x6F,0x75,0x67,0x68,0x20,0x69,0x74,0x20,
	1806	+ 0x6D,0x61,0x79,0x20,0x73,0x6F,0x6D,0x65,0x74,0x69,0x6D,0x65,
	1807	+ 0x73,0x20,0x73,0x6F,0x75,0x6E,0x64,0x20,0x74,0x6F,0x6F,0x20,
	1808	+ 0x66,0x69,0x6C,0x74,0x65,0x72,0x65,0x64,0x2A,0x6F,0x6E,0x20,
	1809	+ 0x6C,0x6F,0x77,0x2D,0x71,0x75,0x61,0x6C,0x69,0x74,0x79,0x20,
	1810	+ 0x73,0x61,0x6D,0x70,0x6C,0x65,0x73,0x20,0x28,0x66,0x2E,0x65,
	1811	+ 0x78,0x2E,0x20,0x41,0x6D,0x69,0x67,0x61,0x20,0x4D,0x4F,0x44,
	1812	+ 0x73,0x29,0x2E,0x00,0x1A,0x3E,0x40,0x58,0x30,0x34,0x30,0x40,
	1813	+ 0x43,0x30,0x30,0x31,0x56,0x6F,0x6C,0x75,0x6D,0x65,0x20,0x72,
	1814	+ 0x61,0x6D,0x70,0x69,0x6E,0x67,0x3A,0x0B,0x3E,0x40,0x58,0x30,
	1815	+ 0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x3B,0x45,0x6E,0x61,0x62,
	1816	+ 0x6C,0x65,0x73,0x20,0x74,0x68,0x65,0x20,0x61,0x6E,0x74,0x69,
	1817	+ 0x2D,0x63,0x6C,0x69,0x63,0x6B,0x20,0x73,0x79,0x73,0x74,0x65,
	1818	+ 0x6D,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x61,0x75,0x64,
	1819	+ 0x69,0x6F,0x20,0x6D,0x69,0x78,0x65,0x72,0x20,0x28,0x46,0x54,
	1820	+ 0x32,0x2E,0x30,0x38,0x2B,0x29,0x2E,0x3B,0x50,0x6C,0x65,0x61,
	1821	+ 0x73,0x65,0x20,0x6E,0x6F,0x74,0x65,0x20,0x74,0x68,0x61,0x74,
	1822	+ 0x20,0x6F,0x72,0x69,0x67,0x69,0x6E,0x61,0x6C,0x20,0x46,0x54,
	1823	+ 0x32,0x20,0x63,0x61,0x6E,0x27,0x74,0x20,0x6C,0x6F,0x61,0x64,
	1824	+ 0x20,0x74,0x68,0x69,0x73,0x20,0x63,0x6F,0x6E,0x66,0x69,0x67,
	1825	+ 0x20,0x65,0x6E,0x74,0x72,0x79,0x2C,0x0B,0x63,0x6C,0x6F,0x6E,
	1826	+ 0x65,0x20,0x6F,0x6E,0x6C,0x79,0x2E,0x00,0x19,0x3E,0x40,0x58,
	1827	+ 0x30,0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x41,0x6D,0x70,0x6C,
	1828	+ 0x69,0x66,0x69,0x63,0x61,0x74,0x69,0x6F,0x6E,0x3A,0x0B,0x3E,
	1829	+ 0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x46,0x41,
	1830	+ 0x6D,0x70,0x6C,0x69,0x66,0x69,0x65,0x73,0x20,0x74,0x68,0x65,
	1831	+ 0x20,0x76,0x6F,0x6C,0x75,0x6D,0x65,0x20,0x77,0x68,0x65,0x6E,
	1832	+ 0x20,0x6D,0x69,0x78,0x69,0x6E,0x67,0x2E,0x20,0x49,0x66,0x20,
	1833	+ 0x79,0x6F,0x75,0x20,0x73,0x65,0x74,0x20,0x74,0x68,0x69,0x73,
	1834	+ 0x20,0x6F,0x6E,0x65,0x20,0x74,0x6F,0x6F,0x20,0x68,0x69,0x67,
	1835	+ 0x68,0x2C,0x20,0x79,0x6F,0x75,0x27,0x6C,0x6C,0x3A,0x67,0x65,
	1836	+ 0x74,0x20,0x64,0x69,0x73,0x74,0x6F,0x72,0x74,0x69,0x6F,0x6E,
	1837	+ 0x2E,0x20,0x33,0x32,0x58,0x20,0x65,0x71,0x75,0x61,0x6C,0x73,
	1838	+ 0x20,0x66,0x75,0x6C,0x6C,0x20,0x61,0x6D,0x70,0x6C,0x69,0x74,
	1839	+ 0x75,0x64,0x65,0x20,0x66,0x6F,0x72,0x20,0x6F,0x6E,0x65,0x20,
	1840	+ 0x63,0x68,0x61,0x6E,0x6E,0x65,0x6C,0x2E,0x00,0x1B,0x3E,0x40,
	1841	+ 0x58,0x30,0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x46,0x72,0x65,
	1842	+ 0x71,0x75,0x65,0x6E,0x63,0x79,0x20,0x74,0x61,0x62,0x6C,0x65,
	1843	+ 0x3A,0x0B,0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,
	1844	+ 0x32,0x40,0x54,0x68,0x65,0x20,0x6C,0x69,0x6E,0x65,0x61,0x72,
	1845	+ 0x20,0x66,0x72,0x65,0x71,0x75,0x65,0x6E,0x63,0x79,0x20,0x74,
	1846	+ 0x61,0x62,0x6C,0x65,0x20,0x6D,0x61,0x6B,0x65,0x73,0x20,0x61,
	1847	+ 0x6C,0x6C,0x20,0x70,0x69,0x74,0x63,0x68,0x20,0x62,0x65,0x6E,
	1848	+ 0x64,0x73,0x20,0x72,0x75,0x6E,0x20,0x69,0x6E,0x20,0x63,0x6F,
	1849	+ 0x6E,0x73,0x74,0x61,0x6E,0x74,0x3F,0x73,0x70,0x65,0x65,0x64,
	1850	+ 0x2C,0x20,0x69,0x6E,0x64,0x65,0x70,0x65,0x6E,0x64,0x65,0x6E,
	1851	+ 0x74,0x20,0x6F,0x66,0x20,0x74,0x68,0x65,0x20,0x63,0x75,0x72,
	1852	+ 0x72,0x65,0x6E,0x74,0x20,0x66,0x72,0x65,0x71,0x75,0x65,0x6E,
	1853	+ 0x63,0x79,0x2E,0x20,0x49,0x66,0x20,0x79,0x6F,0x75,0x20,0x73,
	1854	+ 0x77,0x69,0x74,0x63,0x68,0x20,0x74,0x68,0x69,0x73,0x41,0x6F,
	1855	+ 0x6E,0x65,0x2C,0x20,0x6F,0x6E,0x20,0x61,0x20,0x66,0x69,0x6E,
	1856	+ 0x69,0x73,0x68,0x65,0x64,0x20,0x73,0x6F,0x6E,0x67,0x2C,0x20,
	1857	+ 0x69,0x74,0x20,0x6D,0x69,0x67,0x68,0x74,0x20,0x73,0x6F,0x75,
	1858	+ 0x6E,0x64,0x20,0x73,0x74,0x72,0x61,0x6E,0x67,0x65,0x20,0x69,
	1859	+ 0x66,0x20,0x74,0x68,0x65,0x20,0x73,0x6F,0x75,0x6E,0x64,0x20,
	1860	+ 0x75,0x73,0x65,0x73,0x0D,0x70,0x6F,0x72,0x74,0x61,0x6D,0x65,
	1861	+ 0x6E,0x74,0x6F,0x65,0x73,0x2E,0x00,0x20,0x40,0x58,0x30,0x32,
	1862	+ 0x30,0x40,0x43,0x30,0x30,0x31,0x43,0x6F,0x6E,0x66,0x69,0x67,
	1863	+ 0x75,0x72,0x61,0x74,0x69,0x6F,0x6E,0x2C,0x20,0x4C,0x61,0x79,
	1864	+ 0x6F,0x75,0x74,0x3A,0x01,0x3E,0x29,0x3E,0x40,0x58,0x30,0x34,
	1865	+ 0x30,0x40,0x43,0x30,0x30,0x31,0x50,0x61,0x74,0x74,0x65,0x72,
	1866	+ 0x6E,0x20,0x6C,0x61,0x79,0x6F,0x75,0x74,0x2C,0x20,0x68,0x65,
	1867	+ 0x78,0x20,0x6E,0x75,0x6D,0x62,0x65,0x72,0x69,0x6E,0x67,0x3A,
1843	1868	0x0B,0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,
1844		− 0x40,0x54,0x68,0x65,0x20,0x6C,0x69,0x6E,0x65,0x61,0x72,0x20,
1845		− 0x66,0x72,0x65,0x71,0x75,0x65,0x6E,0x63,0x79,0x20,0x74,0x61,
1846		− 0x62,0x6C,0x65,0x20,0x6D,0x61,0x6B,0x65,0x73,0x20,0x61,0x6C,
1847		− 0x6C,0x20,0x70,0x69,0x74,0x63,0x68,0x20,0x62,0x65,0x6E,0x64,
1848		− 0x73,0x20,0x72,0x75,0x6E,0x20,0x69,0x6E,0x20,0x63,0x6F,0x6E,
1849		− 0x73,0x74,0x61,0x6E,0x74,0x3F,0x73,0x70,0x65,0x65,0x64,0x2C,
1850		− 0x20,0x69,0x6E,0x64,0x65,0x70,0x65,0x6E,0x64,0x65,0x6E,0x74,
1851		− 0x20,0x6F,0x66,0x20,0x74,0x68,0x65,0x20,0x63,0x75,0x72,0x72,
1852		− 0x65,0x6E,0x74,0x20,0x66,0x72,0x65,0x71,0x75,0x65,0x6E,0x63,
1853		− 0x79,0x2E,0x20,0x49,0x66,0x20,0x79,0x6F,0x75,0x20,0x73,0x77,
1854		− 0x69,0x74,0x63,0x68,0x20,0x74,0x68,0x69,0x73,0x41,0x6F,0x6E,
1855		− 0x65,0x2C,0x20,0x6F,0x6E,0x20,0x61,0x20,0x66,0x69,0x6E,0x69,
1856		− 0x73,0x68,0x65,0x64,0x20,0x73,0x6F,0x6E,0x67,0x2C,0x20,0x69,
1857		− 0x74,0x20,0x6D,0x69,0x67,0x68,0x74,0x20,0x73,0x6F,0x75,0x6E,
1858		− 0x64,0x20,0x73,0x74,0x72,0x61,0x6E,0x67,0x65,0x20,0x69,0x66,
1859		− 0x20,0x74,0x68,0x65,0x20,0x73,0x6F,0x75,0x6E,0x64,0x20,0x75,
1860		− 0x73,0x65,0x73,0x0D,0x70,0x6F,0x72,0x74,0x61,0x6D,0x65,0x6E,
1861		− 0x74,0x6F,0x65,0x73,0x2E,0x00,0x20,0x40,0x58,0x30,0x32,0x30,
1862		− 0x40,0x43,0x30,0x30,0x31,0x43,0x6F,0x6E,0x66,0x69,0x67,0x75,
1863		− 0x72,0x61,0x74,0x69,0x6F,0x6E,0x2C,0x20,0x4C,0x61,0x79,0x6F,
1864		− 0x75,0x74,0x3A,0x01,0x3E,0x29,0x3E,0x40,0x58,0x30,0x34,0x30,
1865		− 0x40,0x43,0x30,0x30,0x31,0x50,0x61,0x74,0x74,0x65,0x72,0x6E,
1866		− 0x20,0x6C,0x61,0x79,0x6F,0x75,0x74,0x2C,0x20,0x68,0x65,0x78,
1867		− 0x20,0x6E,0x75,0x6D,0x62,0x65,0x72,0x69,0x6E,0x67,0x3A,0x0B,
1868		− 0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x41,
1869		− 0x49,0x66,0x20,0x79,0x6F,0x75,0x20,0x75,0x73,0x65,0x20,0x70,
1870		− 0x61,0x74,0x74,0x65,0x72,0x6E,0x73,0x20,0x74,0x68,0x61,0x74,
1871		− 0x20,0x61,0x72,0x65,0x20,0x6C,0x6F,0x6E,0x67,0x65,0x72,0x20,
1872		− 0x74,0x68,0x61,0x6E,0x20,0x39,0x39,0x20,0x6C,0x69,0x6E,0x65,
1873		− 0x73,0x2C,0x20,0x79,0x6F,0x75,0x20,0x73,0x68,0x6F,0x75,0x6C,
1874		− 0x64,0x20,0x75,0x73,0x65,0x45,0x68,0x65,0x78,0x20,0x63,0x6F,
1875		− 0x75,0x6E,0x74,0x69,0x6E,0x67,0x20,0x73,0x69,0x6E,0x63,0x65,
1876		− 0x20,0x74,0x68,0x65,0x72,0x65,0x20,0x61,0x72,0x65,0x20,0x6F,
1877		− 0x6E,0x6C,0x79,0x20,0x32,0x20,0x64,0x69,0x67,0x69,0x74,0x73,
1878		− 0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x6C,0x69,0x6E,0x65,
1879		− 0x20,0x6E,0x75,0x6D,0x62,0x65,0x72,0x20,0x63,0x6F,0x6C,0x75,
1880		− 0x6D,0x6E,0x2E,0x00,0x12,0x3E,0x40,0x58,0x30,0x34,0x30,0x40,
1881		− 0x43,0x30,0x30,0x31,0x53,0x63,0x6F,0x70,0x65,0x73,0x3A,0x0B,
1882		− 0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x43,
1883		− 0x22,0x53,0x74,0x64,0x2E,0x22,0x20,0x28,0x73,0x74,0x61,0x6E,
1884		− 0x64,0x61,0x72,0x64,0x29,0x20,0x77,0x69,0x6C,0x6C,0x20,0x73,
1885		− 0x68,0x6F,0x77,0x20,0x74,0x68,0x65,0x20,0x73,0x61,0x6D,0x70,
1886		− 0x6C,0x65,0x20,0x70,0x6F,0x69,0x6E,0x74,0x73,0x20,0x61,0x73,
1887		− 0x20,0x70,0x69,0x78,0x65,0x6C,0x73,0x20,0x28,0x6C,0x69,0x6B,
1888		− 0x65,0x20,0x46,0x54,0x32,0x29,0x2E,0x41,0x22,0x4C,0x69,0x6E,
1889		− 0x65,0x64,0x22,0x20,0x77,0x69,0x6C,0x6C,0x20,0x64,0x72,0x61,
1890		− 0x77,0x20,0x6C,0x69,0x6E,0x65,0x73,0x20,0x62,0x65,0x74,0x77,
1891		− 0x65,0x65,0x6E,0x20,0x74,0x68,0x65,0x20,0x70,0x6F,0x69,0x6E,
1892		− 0x74,0x73,0x2C,0x20,0x6C,0x69,0x6B,0x65,0x20,0x61,0x6E,0x20,
1893		− 0x6F,0x73,0x63,0x69,0x6C,0x6C,0x6F,0x73,0x63,0x6F,0x70,0x65,
1894		− 0x2E,0x00,0x27,0x40,0x58,0x30,0x32,0x30,0x40,0x43,0x30,0x30,
1895		− 0x31,0x43,0x6F,0x6E,0x66,0x69,0x67,0x75,0x72,0x61,0x74,0x69,
1896		− 0x6F,0x6E,0x2C,0x20,0x4D,0x69,0x73,0x63,0x65,0x6C,0x6C,0x61,
1897		− 0x6E,0x65,0x6F,0x75,0x73,0x3A,0x01,0x3E,0x15,0x3E,0x40,0x58,
1898		− 0x30,0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x56,0x53,0x79,0x6E,
1899		− 0x63,0x20,0x6F,0x66,0x66,0x3A,0x0B,0x3E,0x40,0x58,0x30,0x36,
1900		− 0x30,0x40,0x43,0x30,0x30,0x32,0x3F,0x54,0x65,0x6C,0x6C,0x73,
1901		− 0x20,0x74,0x68,0x65,0x20,0x70,0x72,0x6F,0x67,0x72,0x61,0x6D,
1902		− 0x20,0x74,0x6F,0x20,0x6E,0x6F,0x74,0x20,0x75,0x73,0x65,0x20,
1903		− 0x56,0x53,0x79,0x6E,0x63,0x20,0x66,0x6F,0x72,0x20,0x76,0x69,
1904		− 0x64,0x65,0x6F,0x2E,0x20,0x49,0x66,0x20,0x79,0x6F,0x75,0x72,
1905		− 0x20,0x6D,0x6F,0x6E,0x69,0x74,0x6F,0x72,0x27,0x73,0x40,0x72,
1906		− 0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x72,0x61,0x74,0x65,0x20,
1907		− 0x69,0x73,0x20,0x6E,0x6F,0x74,0x20,0x36,0x30,0x48,0x7A,0x20,
1908		− 0x28,0x6F,0x72,0x20,0x35,0x39,0x48,0x7A,0x29,0x2C,0x20,0x74,
1909		− 0x68,0x65,0x6E,0x20,0x56,0x53,0x79,0x6E,0x63,0x20,0x69,0x73,
1910		− 0x20,0x61,0x6C,0x77,0x61,0x79,0x73,0x20,0x6F,0x66,0x66,0x20,
1911		− 0x66,0x6F,0x72,0x45,0x74,0x68,0x69,0x73,0x20,0x70,0x72,0x6F,
1912		− 0x67,0x72,0x61,0x6D,0x2E,0x20,0x4E,0x6F,0x74,0x20,0x68,0x61,
1913		− 0x76,0x69,0x6E,0x67,0x20,0x56,0x53,0x79,0x6E,0x63,0x20,0x77,
1914		− 0x69,0x6C,0x6C,0x20,0x72,0x65,0x73,0x75,0x6C,0x74,0x20,0x69,
1915		− 0x6E,0x20,0x6C,0x65,0x73,0x73,0x20,0x69,0x6E,0x70,0x75,0x74,
1916		− 0x2F,0x76,0x69,0x64,0x65,0x6F,0x20,0x64,0x65,0x6C,0x61,0x79,
1917		− 0x2C,0x1E,0x62,0x75,0x74,0x20,0x61,0x6C,0x73,0x6F,0x20,0x70,
1918		− 0x6F,0x74,0x65,0x6E,0x74,0x69,0x61,0x6C,0x20,0x73,0x74,0x75,
1919		− 0x74,0x74,0x65,0x72,0x69,0x6E,0x67,0x2E,0x01,0x20,0x18,0x3E,
1920		− 0x40,0x58,0x30,0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x50,0x69,
1921		− 0x78,0x65,0x6C,0x20,0x66,0x69,0x6C,0x74,0x65,0x72,0x3A,0x0B,
1922		− 0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x43,
1923		− 0x41,0x70,0x70,0x6C,0x69,0x65,0x73,0x20,0x61,0x20,0x73,0x75,
1924		− 0x62,0x70,0x69,0x78,0x65,0x6C,0x20,0x66,0x69,0x6C,0x74,0x65,
1925		− 0x72,0x20,0x74,0x68,0x61,0x74,0x20,0x69,0x73,0x20,0x75,0x73,
1926		− 0x65,0x64,0x20,0x77,0x68,0x65,0x6E,0x20,0x74,0x68,0x65,0x20,
1927		− 0x77,0x69,0x6E,0x64,0x6F,0x77,0x20,0x69,0x73,0x20,0x75,0x70,
1928		− 0x73,0x63,0x61,0x6C,0x65,0x64,0x2E,0x43,0x54,0x68,0x69,0x73,
1929		− 0x20,0x61,0x6C,0x73,0x6F,0x20,0x6D,0x61,0x6B,0x65,0x73,0x20,
1930		− 0x66,0x75,0x6C,0x6C,0x73,0x63,0x72,0x65,0x65,0x6E,0x20,0x6D,
1931		− 0x6F,0x64,0x65,0x20,0x63,0x6F,0x6D,0x70,0x6C,0x65,0x74,0x65,
1932		− 0x6C,0x79,0x20,0x73,0x74,0x72,0x65,0x74,0x63,0x68,0x20,0x6F,
1933		− 0x75,0x74,0x20,0x69,0x66,0x20,0x69,0x74,0x20,0x64,0x69,0x64,
1934		− 0x6E,0x27,0x74,0x44,0x61,0x6C,0x72,0x65,0x61,0x64,0x79,0x2E,
1935		− 0x20,0x50,0x6C,0x65,0x61,0x73,0x65,0x20,0x6B,0x65,0x65,0x70,
1936		− 0x20,0x69,0x6E,0x20,0x6D,0x69,0x6E,0x64,0x20,0x74,0x68,0x61,
1937		− 0x74,0x20,0x74,0x68,0x69,0x73,0x20,0x77,0x69,0x6C,0x6C,0x20,
1938		− 0x6D,0x61,0x6B,0x65,0x20,0x70,0x69,0x78,0x65,0x6C,0x73,0x20,
1939		− 0x6C,0x6F,0x6F,0x6B,0x20,0x62,0x6C,0x75,0x72,0x72,0x79,0x2E,
1940		− 0x00,0x23,0x40,0x58,0x30,0x32,0x30,0x40,0x43,0x30,0x30,0x31,
1941		− 0x41,0x64,0x76,0x61,0x6E,0x63,0x65,0x64,0x20,0x65,0x64,0x69,
1942		− 0x74,0x20,0x66,0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x73,0x3A,
1943		− 0x20,0x01,0x3E,0x1E,0x3E,0x40,0x58,0x30,0x34,0x30,0x40,0x43,
1944		− 0x30,0x30,0x31,0x43,0x6F,0x70,0x79,0x2F,0x50,0x61,0x73,0x74,
1945		− 0x65,0x20,0x6D,0x61,0x73,0x6B,0x69,0x6E,0x67,0x3A,0x0B,0x3E,
1946		− 0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x37,0x54,
1947		− 0x68,0x65,0x20,0x6D,0x61,0x73,0x6B,0x69,0x6E,0x67,0x20,0x69,
1948		− 0x73,0x20,0x75,0x73,0x65,0x64,0x20,0x66,0x6F,0x72,0x20,0x63,
1949		− 0x6F,0x70,0x79,0x69,0x6E,0x67,0x2F,0x70,0x61,0x73,0x74,0x69,
1950		− 0x6E,0x67,0x20,0x6F,0x6E,0x6C,0x79,0x20,0x70,0x61,0x72,0x74,
1951		− 0x73,0x20,0x6F,0x66,0x20,0x61,0x46,0x22,0x6E,0x6F,0x74,0x65,
1952		− 0x2D,0x63,0x65,0x6C,0x6C,0x22,0x2E,0x20,0x54,0x68,0x65,0x20,
1953		− 0x64,0x69,0x66,0x66,0x65,0x72,0x65,0x6E,0x74,0x20,0x70,0x61,
1954		− 0x72,0x74,0x73,0x20,0x6F,0x66,0x20,0x61,0x20,0x22,0x6E,0x6F,
1955		− 0x74,0x65,0x2D,0x63,0x65,0x6C,0x6C,0x22,0x20,0x69,0x73,0x20,
1956		− 0x4E,0x6F,0x74,0x65,0x2C,0x20,0x49,0x6E,0x73,0x74,0x72,0x2E,
1957		− 0x20,0x6E,0x72,0x2E,0x2C,0x20,0x56,0x6F,0x6C,0x75,0x6D,0x65,
1958		− 0x2C,0x20,0x45,0x66,0x66,0x65,0x63,0x74,0x20,0x6E,0x72,0x20,
1959		− 0x26,0x20,0x45,0x66,0x66,0x65,0x63,0x74,0x20,0x64,0x61,0x74,
1960		− 0x61,0x2E,0x34,0x3E,0x41,0x73,0x20,0x79,0x6F,0x75,0x20,0x63,
1961		− 0x61,0x6E,0x20,0x73,0x65,0x65,0x20,0x69,0x6E,0x20,0x74,0x68,
1962		− 0x65,0x20,0x77,0x69,0x6E,0x64,0x6F,0x77,0x20,0x74,0x68,0x65,
1963		− 0x72,0x65,0x20,0x61,0x72,0x65,0x20,0x33,0x20,0x63,0x6F,0x6C,
1964		− 0x75,0x6D,0x6E,0x73,0x20,0x6F,0x66,0x3D,0x22,0x65,0x6E,0x61,
1965		− 0x62,0x6C,0x65,0x2F,0x64,0x69,0x73,0x61,0x62,0x6C,0x65,0x20,
1966		− 0x62,0x75,0x74,0x74,0x6F,0x6E,0x73,0x22,0x20,0x77,0x68,0x69,
1967		− 0x63,0x68,0x20,0x68,0x61,0x73,0x20,0x74,0x68,0x65,0x20,0x6C,
1968		− 0x65,0x74,0x74,0x65,0x72,0x73,0x20,0x43,0x2C,0x50,0x20,0x26,
1969		− 0x20,0x54,0x20,0x61,0x62,0x6F,0x76,0x65,0x2E,0x45,0x3E,0x43,
1970		− 0x20,0x6D,0x65,0x61,0x6E,0x73,0x20,0x63,0x6F,0x70,0x79,0x2C,
1971		− 0x20,0x69,0x74,0x20,0x63,0x6F,0x6E,0x74,0x72,0x6F,0x6C,0x73,
	1869	+ 0x41,0x49,0x66,0x20,0x79,0x6F,0x75,0x20,0x75,0x73,0x65,0x20,
	1870	+ 0x70,0x61,0x74,0x74,0x65,0x72,0x6E,0x73,0x20,0x74,0x68,0x61,
	1871	+ 0x74,0x20,0x61,0x72,0x65,0x20,0x6C,0x6F,0x6E,0x67,0x65,0x72,
	1872	+ 0x20,0x74,0x68,0x61,0x6E,0x20,0x39,0x39,0x20,0x6C,0x69,0x6E,
	1873	+ 0x65,0x73,0x2C,0x20,0x79,0x6F,0x75,0x20,0x73,0x68,0x6F,0x75,
	1874	+ 0x6C,0x64,0x20,0x75,0x73,0x65,0x45,0x68,0x65,0x78,0x20,0x63,
	1875	+ 0x6F,0x75,0x6E,0x74,0x69,0x6E,0x67,0x20,0x73,0x69,0x6E,0x63,
	1876	+ 0x65,0x20,0x74,0x68,0x65,0x72,0x65,0x20,0x61,0x72,0x65,0x20,
	1877	+ 0x6F,0x6E,0x6C,0x79,0x20,0x32,0x20,0x64,0x69,0x67,0x69,0x74,
	1878	+ 0x73,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x6C,0x69,0x6E,
	1879	+ 0x65,0x20,0x6E,0x75,0x6D,0x62,0x65,0x72,0x20,0x63,0x6F,0x6C,
	1880	+ 0x75,0x6D,0x6E,0x2E,0x00,0x12,0x3E,0x40,0x58,0x30,0x34,0x30,
	1881	+ 0x40,0x43,0x30,0x30,0x31,0x53,0x63,0x6F,0x70,0x65,0x73,0x3A,
	1882	+ 0x0B,0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,
	1883	+ 0x43,0x22,0x53,0x74,0x64,0x2E,0x22,0x20,0x28,0x73,0x74,0x61,
	1884	+ 0x6E,0x64,0x61,0x72,0x64,0x29,0x20,0x77,0x69,0x6C,0x6C,0x20,
	1885	+ 0x73,0x68,0x6F,0x77,0x20,0x74,0x68,0x65,0x20,0x73,0x61,0x6D,
	1886	+ 0x70,0x6C,0x65,0x20,0x70,0x6F,0x69,0x6E,0x74,0x73,0x20,0x61,
	1887	+ 0x73,0x20,0x70,0x69,0x78,0x65,0x6C,0x73,0x20,0x28,0x6C,0x69,
	1888	+ 0x6B,0x65,0x20,0x46,0x54,0x32,0x29,0x2E,0x41,0x22,0x4C,0x69,
	1889	+ 0x6E,0x65,0x64,0x22,0x20,0x77,0x69,0x6C,0x6C,0x20,0x64,0x72,
	1890	+ 0x61,0x77,0x20,0x6C,0x69,0x6E,0x65,0x73,0x20,0x62,0x65,0x74,
	1891	+ 0x77,0x65,0x65,0x6E,0x20,0x74,0x68,0x65,0x20,0x70,0x6F,0x69,
	1892	+ 0x6E,0x74,0x73,0x2C,0x20,0x6C,0x69,0x6B,0x65,0x20,0x61,0x6E,
	1893	+ 0x20,0x6F,0x73,0x63,0x69,0x6C,0x6C,0x6F,0x73,0x63,0x6F,0x70,
	1894	+ 0x65,0x2E,0x00,0x27,0x40,0x58,0x30,0x32,0x30,0x40,0x43,0x30,
	1895	+ 0x30,0x31,0x43,0x6F,0x6E,0x66,0x69,0x67,0x75,0x72,0x61,0x74,
	1896	+ 0x69,0x6F,0x6E,0x2C,0x20,0x4D,0x69,0x73,0x63,0x65,0x6C,0x6C,
	1897	+ 0x61,0x6E,0x65,0x6F,0x75,0x73,0x3A,0x01,0x3E,0x15,0x3E,0x40,
	1898	+ 0x58,0x30,0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x56,0x53,0x79,
	1899	+ 0x6E,0x63,0x20,0x6F,0x66,0x66,0x3A,0x0B,0x3E,0x40,0x58,0x30,
	1900	+ 0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x3F,0x54,0x65,0x6C,0x6C,
	1901	+ 0x73,0x20,0x74,0x68,0x65,0x20,0x70,0x72,0x6F,0x67,0x72,0x61,
	1902	+ 0x6D,0x20,0x74,0x6F,0x20,0x6E,0x6F,0x74,0x20,0x75,0x73,0x65,
	1903	+ 0x20,0x56,0x53,0x79,0x6E,0x63,0x20,0x66,0x6F,0x72,0x20,0x76,
	1904	+ 0x69,0x64,0x65,0x6F,0x2E,0x20,0x49,0x66,0x20,0x79,0x6F,0x75,
	1905	+ 0x72,0x20,0x6D,0x6F,0x6E,0x69,0x74,0x6F,0x72,0x27,0x73,0x40,
	1906	+ 0x72,0x65,0x66,0x72,0x65,0x73,0x68,0x20,0x72,0x61,0x74,0x65,
	1907	+ 0x20,0x69,0x73,0x20,0x6E,0x6F,0x74,0x20,0x36,0x30,0x48,0x7A,
	1908	+ 0x20,0x28,0x6F,0x72,0x20,0x35,0x39,0x48,0x7A,0x29,0x2C,0x20,
	1909	+ 0x74,0x68,0x65,0x6E,0x20,0x56,0x53,0x79,0x6E,0x63,0x20,0x69,
	1910	+ 0x73,0x20,0x61,0x6C,0x77,0x61,0x79,0x73,0x20,0x6F,0x66,0x66,
	1911	+ 0x20,0x66,0x6F,0x72,0x45,0x74,0x68,0x69,0x73,0x20,0x70,0x72,
	1912	+ 0x6F,0x67,0x72,0x61,0x6D,0x2E,0x20,0x4E,0x6F,0x74,0x20,0x68,
	1913	+ 0x61,0x76,0x69,0x6E,0x67,0x20,0x56,0x53,0x79,0x6E,0x63,0x20,
	1914	+ 0x77,0x69,0x6C,0x6C,0x20,0x72,0x65,0x73,0x75,0x6C,0x74,0x20,
	1915	+ 0x69,0x6E,0x20,0x6C,0x65,0x73,0x73,0x20,0x69,0x6E,0x70,0x75,
	1916	+ 0x74,0x2F,0x76,0x69,0x64,0x65,0x6F,0x20,0x64,0x65,0x6C,0x61,
	1917	+ 0x79,0x2C,0x1E,0x62,0x75,0x74,0x20,0x61,0x6C,0x73,0x6F,0x20,
	1918	+ 0x70,0x6F,0x74,0x65,0x6E,0x74,0x69,0x61,0x6C,0x20,0x73,0x74,
	1919	+ 0x75,0x74,0x74,0x65,0x72,0x69,0x6E,0x67,0x2E,0x01,0x20,0x18,
	1920	+ 0x3E,0x40,0x58,0x30,0x34,0x30,0x40,0x43,0x30,0x30,0x31,0x50,
	1921	+ 0x69,0x78,0x65,0x6C,0x20,0x66,0x69,0x6C,0x74,0x65,0x72,0x3A,
	1922	+ 0x0B,0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,
	1923	+ 0x43,0x41,0x70,0x70,0x6C,0x69,0x65,0x73,0x20,0x61,0x20,0x73,
	1924	+ 0x75,0x62,0x70,0x69,0x78,0x65,0x6C,0x20,0x66,0x69,0x6C,0x74,
	1925	+ 0x65,0x72,0x20,0x74,0x68,0x61,0x74,0x20,0x69,0x73,0x20,0x75,
	1926	+ 0x73,0x65,0x64,0x20,0x77,0x68,0x65,0x6E,0x20,0x74,0x68,0x65,
	1927	+ 0x20,0x77,0x69,0x6E,0x64,0x6F,0x77,0x20,0x69,0x73,0x20,0x75,
	1928	+ 0x70,0x73,0x63,0x61,0x6C,0x65,0x64,0x2E,0x43,0x54,0x68,0x69,
	1929	+ 0x73,0x20,0x61,0x6C,0x73,0x6F,0x20,0x6D,0x61,0x6B,0x65,0x73,
	1930	+ 0x20,0x66,0x75,0x6C,0x6C,0x73,0x63,0x72,0x65,0x65,0x6E,0x20,
	1931	+ 0x6D,0x6F,0x64,0x65,0x20,0x63,0x6F,0x6D,0x70,0x6C,0x65,0x74,
	1932	+ 0x65,0x6C,0x79,0x20,0x73,0x74,0x72,0x65,0x74,0x63,0x68,0x20,
	1933	+ 0x6F,0x75,0x74,0x20,0x69,0x66,0x20,0x69,0x74,0x20,0x64,0x69,
	1934	+ 0x64,0x6E,0x27,0x74,0x44,0x61,0x6C,0x72,0x65,0x61,0x64,0x79,
	1935	+ 0x2E,0x20,0x50,0x6C,0x65,0x61,0x73,0x65,0x20,0x6B,0x65,0x65,
	1936	+ 0x70,0x20,0x69,0x6E,0x20,0x6D,0x69,0x6E,0x64,0x20,0x74,0x68,
	1937	+ 0x61,0x74,0x20,0x74,0x68,0x69,0x73,0x20,0x77,0x69,0x6C,0x6C,
	1938	+ 0x20,0x6D,0x61,0x6B,0x65,0x20,0x70,0x69,0x78,0x65,0x6C,0x73,
	1939	+ 0x20,0x6C,0x6F,0x6F,0x6B,0x20,0x62,0x6C,0x75,0x72,0x72,0x79,
	1940	+ 0x2E,0x00,0x23,0x40,0x58,0x30,0x32,0x30,0x40,0x43,0x30,0x30,
	1941	+ 0x31,0x41,0x64,0x76,0x61,0x6E,0x63,0x65,0x64,0x20,0x65,0x64,
	1942	+ 0x69,0x74,0x20,0x66,0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x73,
	1943	+ 0x3A,0x20,0x01,0x3E,0x1E,0x3E,0x40,0x58,0x30,0x34,0x30,0x40,
	1944	+ 0x43,0x30,0x30,0x31,0x43,0x6F,0x70,0x79,0x2F,0x50,0x61,0x73,
	1945	+ 0x74,0x65,0x20,0x6D,0x61,0x73,0x6B,0x69,0x6E,0x67,0x3A,0x0B,
	1946	+ 0x3E,0x40,0x58,0x30,0x36,0x30,0x40,0x43,0x30,0x30,0x32,0x37,
	1947	+ 0x54,0x68,0x65,0x20,0x6D,0x61,0x73,0x6B,0x69,0x6E,0x67,0x20,
	1948	+ 0x69,0x73,0x20,0x75,0x73,0x65,0x64,0x20,0x66,0x6F,0x72,0x20,
	1949	+ 0x63,0x6F,0x70,0x79,0x69,0x6E,0x67,0x2F,0x70,0x61,0x73,0x74,
	1950	+ 0x69,0x6E,0x67,0x20,0x6F,0x6E,0x6C,0x79,0x20,0x70,0x61,0x72,
	1951	+ 0x74,0x73,0x20,0x6F,0x66,0x20,0x61,0x46,0x22,0x6E,0x6F,0x74,
	1952	+ 0x65,0x2D,0x63,0x65,0x6C,0x6C,0x22,0x2E,0x20,0x54,0x68,0x65,
	1953	+ 0x20,0x64,0x69,0x66,0x66,0x65,0x72,0x65,0x6E,0x74,0x20,0x70,
	1954	+ 0x61,0x72,0x74,0x73,0x20,0x6F,0x66,0x20,0x61,0x20,0x22,0x6E,
	1955	+ 0x6F,0x74,0x65,0x2D,0x63,0x65,0x6C,0x6C,0x22,0x20,0x69,0x73,
	1956	+ 0x20,0x4E,0x6F,0x74,0x65,0x2C,0x20,0x49,0x6E,0x73,0x74,0x72,
	1957	+ 0x2E,0x20,0x6E,0x72,0x2E,0x2C,0x20,0x56,0x6F,0x6C,0x75,0x6D,
	1958	+ 0x65,0x2C,0x20,0x45,0x66,0x66,0x65,0x63,0x74,0x20,0x6E,0x72,
	1959	+ 0x20,0x26,0x20,0x45,0x66,0x66,0x65,0x63,0x74,0x20,0x64,0x61,
	1960	+ 0x74,0x61,0x2E,0x34,0x3E,0x41,0x73,0x20,0x79,0x6F,0x75,0x20,
	1961	+ 0x63,0x61,0x6E,0x20,0x73,0x65,0x65,0x20,0x69,0x6E,0x20,0x74,
	1962	+ 0x68,0x65,0x20,0x77,0x69,0x6E,0x64,0x6F,0x77,0x20,0x74,0x68,
	1963	+ 0x65,0x72,0x65,0x20,0x61,0x72,0x65,0x20,0x33,0x20,0x63,0x6F,
	1964	+ 0x6C,0x75,0x6D,0x6E,0x73,0x20,0x6F,0x66,0x3D,0x22,0x65,0x6E,
	1965	+ 0x61,0x62,0x6C,0x65,0x2F,0x64,0x69,0x73,0x61,0x62,0x6C,0x65,
	1966	+ 0x20,0x62,0x75,0x74,0x74,0x6F,0x6E,0x73,0x22,0x20,0x77,0x68,
	1967	+ 0x69,0x63,0x68,0x20,0x68,0x61,0x73,0x20,0x74,0x68,0x65,0x20,
	1968	+ 0x6C,0x65,0x74,0x74,0x65,0x72,0x73,0x20,0x43,0x2C,0x50,0x20,
	1969	+ 0x26,0x20,0x54,0x20,0x61,0x62,0x6F,0x76,0x65,0x2E,0x45,0x3E,
	1970	+ 0x43,0x20,0x6D,0x65,0x61,0x6E,0x73,0x20,0x63,0x6F,0x70,0x79,
	1971	+ 0x2C,0x20,0x69,0x74,0x20,0x63,0x6F,0x6E,0x74,0x72,0x6F,0x6C,
	1972	+ 0x73,0x20,0x77,0x68,0x69,0x63,0x68,0x20,0x70,0x61,0x72,0x74,
	1973	+ 0x73,0x20,0x74,0x68,0x61,0x74,0x20,0x67,0x6F,0x65,0x73,0x20,
	1974	+ 0x69,0x6E,0x74,0x6F,0x20,0x74,0x68,0x65,0x20,0x63,0x6F,0x70,
	1975	+ 0x79,0x62,0x75,0x66,0x66,0x65,0x72,0x2E,0x3E,0x3E,0x50,0x20,
	1976	+ 0x6D,0x65,0x61,0x6E,0x73,0x20,0x70,0x61,0x73,0x74,0x65,0x20,
	1977	+ 0x61,0x6E,0x64,0x20,0x63,0x6F,0x6E,0x74,0x72,0x6F,0x6C,0x73,
1972	1978	0x20,0x77,0x68,0x69,0x63,0x68,0x20,0x70,0x61,0x72,0x74,0x73,
1973		− 0x20,0x74,0x68,0x61,0x74,0x20,0x67,0x6F,0x65,0x73,0x20,0x69,
1974		− 0x6E,0x74,0x6F,0x20,0x74,0x68,0x65,0x20,0x63,0x6F,0x70,0x79,
1975		− 0x62,0x75,0x66,0x66,0x65,0x72,0x2E,0x3E,0x3E,0x50,0x20,0x6D,
1976		− 0x65,0x61,0x6E,0x73,0x20,0x70,0x61,0x73,0x74,0x65,0x20,0x61,
1977		− 0x6E,0x64,0x20,0x63,0x6F,0x6E,0x74,0x72,0x6F,0x6C,0x73,0x20,
1978		− 0x77,0x68,0x69,0x63,0x68,0x20,0x70,0x61,0x72,0x74,0x73,0x20,
1979		− 0x74,0x68,0x61,0x74,0x20,0x67,0x6F,0x65,0x73,0x20,0x6F,0x75,
1980		− 0x74,0x20,0x66,0x72,0x6F,0x6D,0x20,0x74,0x68,0x65,0x0B,0x63,
1981		− 0x6F,0x70,0x79,0x62,0x75,0x66,0x66,0x65,0x72,0x2E,0x45,0x3E,
1982		− 0x54,0x20,0x6D,0x65,0x61,0x6E,0x73,0x20,0x74,0x72,0x61,0x6E,
1983		− 0x73,0x70,0x61,0x72,0x65,0x6E,0x63,0x79,0x2E,0x20,0x49,0x66,
1984		− 0x20,0x69,0x74,0x27,0x73,0x20,0x65,0x6E,0x61,0x62,0x6C,0x65,
1985		− 0x64,0x2C,0x20,0x74,0x68,0x65,0x20,0x70,0x61,0x73,0x74,0x69,
1986		− 0x6E,0x67,0x20,0x64,0x6F,0x65,0x73,0x6E,0x27,0x74,0x20,0x6F,
1987		− 0x76,0x65,0x72,0x77,0x72,0x69,0x74,0x65,0x3D,0x64,0x61,0x74,
1988		− 0x61,0x20,0x77,0x69,0x74,0x68,0x20,0x6E,0x69,0x6C,0x2D,0x69,
1989		− 0x6E,0x66,0x6F,0x72,0x6D,0x61,0x74,0x69,0x6F,0x6E,0x2C,0x20,
1990		− 0x6F,0x6E,0x6C,0x79,0x20,0x77,0x69,0x74,0x68,0x20,0x61,0x20,
1991		− 0x6E,0x6F,0x74,0x65,0x20,0x6F,0x72,0x20,0x61,0x20,0x6E,0x75,
1992		− 0x6D,0x62,0x65,0x72,0x20,0x3C,0x3E,0x20,0x30,0x2E,0x01,0x3E,
1993		− 0x40,0x3E,0x54,0x68,0x65,0x20,0x63,0x75,0x74,0x20,0x66,0x75,
1994		− 0x6E,0x63,0x74,0x69,0x6F,0x6E,0x73,0x20,0x77,0x6F,0x72,0x6B,
1995		− 0x73,0x20,0x6C,0x69,0x6B,0x65,0x20,0x70,0x61,0x73,0x74,0x69,
1996		− 0x6E,0x67,0x20,0x77,0x69,0x74,0x68,0x20,0x7A,0x65,0x72,0x6F,
1997		− 0x2D,0x64,0x61,0x74,0x61,0x2E,0x20,0x54,0x68,0x69,0x73,0x20,
1998		− 0x6D,0x65,0x61,0x6E,0x73,0x3B,0x74,0x68,0x61,0x74,0x20,0x74,
1999		− 0x68,0x65,0x20,0x63,0x75,0x74,0x74,0x69,0x6E,0x67,0x20,0x69,
2000		− 0x73,0x20,0x63,0x6F,0x6E,0x74,0x72,0x6F,0x6C,0x6C,0x65,0x64,
2001		− 0x20,0x77,0x69,0x74,0x68,0x20,0x50,0x2D,0x63,0x6F,0x6C,0x75,
2002		− 0x6D,0x6E,0x20,0x28,0x6F,0x72,0x20,0x54,0x2D,0x63,0x6F,0x6C,
2003		− 0x75,0x6D,0x6E,0x29,0x2E,0x3C,0x3E,0x57,0x68,0x65,0x6E,0x20,
2004		− 0x79,0x6F,0x75,0x20,0x63,0x6F,0x70,0x79,0x20,0x64,0x61,0x74,
2005		− 0x61,0x20,0x77,0x69,0x74,0x68,0x20,0x6D,0x61,0x73,0x6B,0x69,
2006		− 0x6E,0x67,0x2C,0x20,0x74,0x68,0x65,0x20,0x64,0x69,0x73,0x61,
2007		− 0x62,0x6C,0x65,0x64,0x20,0x70,0x61,0x72,0x74,0x73,0x20,0x61,
2008		− 0x72,0x65,0x20,0x6E,0x6F,0x74,0x43,0x63,0x6C,0x65,0x61,0x72,
2009		− 0x65,0x64,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x63,0x6F,
2010		− 0x70,0x79,0x62,0x75,0x66,0x66,0x65,0x72,0x2E,0x20,0x28,0x4D,
2011		− 0x61,0x6B,0x69,0x6E,0x67,0x20,0x69,0x74,0x20,0x70,0x6F,0x73,
2012		− 0x73,0x69,0x62,0x6C,0x65,0x20,0x74,0x6F,0x20,0x63,0x6F,0x6C,
2013		− 0x6C,0x65,0x63,0x74,0x20,0x64,0x61,0x74,0x61,0x20,0x66,0x72,
2014		− 0x6F,0x6D,0x27,0x73,0x65,0x76,0x65,0x72,0x61,0x6C,0x20,0x6C,
2015		− 0x6F,0x63,0x61,0x74,0x69,0x6F,0x6E,0x73,0x20,0x69,0x6E,0x74,
2016		− 0x6F,0x20,0x74,0x68,0x65,0x20,0x63,0x6F,0x70,0x79,0x62,0x75,
2017		− 0x66,0x66,0x65,0x72,0x2E,0x29,0x00,0x03,0x45,0x4E,0x44,0x4C,
2018		− 0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
	1979	+ 0x20,0x74,0x68,0x61,0x74,0x20,0x67,0x6F,0x65,0x73,0x20,0x6F,
	1980	+ 0x75,0x74,0x20,0x66,0x72,0x6F,0x6D,0x20,0x74,0x68,0x65,0x0B,
	1981	+ 0x63,0x6F,0x70,0x79,0x62,0x75,0x66,0x66,0x65,0x72,0x2E,0x45,
	1982	+ 0x3E,0x54,0x20,0x6D,0x65,0x61,0x6E,0x73,0x20,0x74,0x72,0x61,
	1983	+ 0x6E,0x73,0x70,0x61,0x72,0x65,0x6E,0x63,0x79,0x2E,0x20,0x49,
	1984	+ 0x66,0x20,0x69,0x74,0x27,0x73,0x20,0x65,0x6E,0x61,0x62,0x6C,
	1985	+ 0x65,0x64,0x2C,0x20,0x74,0x68,0x65,0x20,0x70,0x61,0x73,0x74,
	1986	+ 0x69,0x6E,0x67,0x20,0x64,0x6F,0x65,0x73,0x6E,0x27,0x74,0x20,
	1987	+ 0x6F,0x76,0x65,0x72,0x77,0x72,0x69,0x74,0x65,0x3D,0x64,0x61,
	1988	+ 0x74,0x61,0x20,0x77,0x69,0x74,0x68,0x20,0x6E,0x69,0x6C,0x2D,
	1989	+ 0x69,0x6E,0x66,0x6F,0x72,0x6D,0x61,0x74,0x69,0x6F,0x6E,0x2C,
	1990	+ 0x20,0x6F,0x6E,0x6C,0x79,0x20,0x77,0x69,0x74,0x68,0x20,0x61,
	1991	+ 0x20,0x6E,0x6F,0x74,0x65,0x20,0x6F,0x72,0x20,0x61,0x20,0x6E,
	1992	+ 0x75,0x6D,0x62,0x65,0x72,0x20,0x3C,0x3E,0x20,0x30,0x2E,0x01,
	1993	+ 0x3E,0x40,0x3E,0x54,0x68,0x65,0x20,0x63,0x75,0x74,0x20,0x66,
	1994	+ 0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x73,0x20,0x77,0x6F,0x72,
	1995	+ 0x6B,0x73,0x20,0x6C,0x69,0x6B,0x65,0x20,0x70,0x61,0x73,0x74,
	1996	+ 0x69,0x6E,0x67,0x20,0x77,0x69,0x74,0x68,0x20,0x7A,0x65,0x72,
	1997	+ 0x6F,0x2D,0x64,0x61,0x74,0x61,0x2E,0x20,0x54,0x68,0x69,0x73,
	1998	+ 0x20,0x6D,0x65,0x61,0x6E,0x73,0x3B,0x74,0x68,0x61,0x74,0x20,
	1999	+ 0x74,0x68,0x65,0x20,0x63,0x75,0x74,0x74,0x69,0x6E,0x67,0x20,
	2000	+ 0x69,0x73,0x20,0x63,0x6F,0x6E,0x74,0x72,0x6F,0x6C,0x6C,0x65,
	2001	+ 0x64,0x20,0x77,0x69,0x74,0x68,0x20,0x50,0x2D,0x63,0x6F,0x6C,
	2002	+ 0x75,0x6D,0x6E,0x20,0x28,0x6F,0x72,0x20,0x54,0x2D,0x63,0x6F,
	2003	+ 0x6C,0x75,0x6D,0x6E,0x29,0x2E,0x3C,0x3E,0x57,0x68,0x65,0x6E,
	2004	+ 0x20,0x79,0x6F,0x75,0x20,0x63,0x6F,0x70,0x79,0x20,0x64,0x61,
	2005	+ 0x74,0x61,0x20,0x77,0x69,0x74,0x68,0x20,0x6D,0x61,0x73,0x6B,
	2006	+ 0x69,0x6E,0x67,0x2C,0x20,0x74,0x68,0x65,0x20,0x64,0x69,0x73,
	2007	+ 0x61,0x62,0x6C,0x65,0x64,0x20,0x70,0x61,0x72,0x74,0x73,0x20,
	2008	+ 0x61,0x72,0x65,0x20,0x6E,0x6F,0x74,0x43,0x63,0x6C,0x65,0x61,
	2009	+ 0x72,0x65,0x64,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x63,
	2010	+ 0x6F,0x70,0x79,0x62,0x75,0x66,0x66,0x65,0x72,0x2E,0x20,0x28,
	2011	+ 0x4D,0x61,0x6B,0x69,0x6E,0x67,0x20,0x69,0x74,0x20,0x70,0x6F,
	2012	+ 0x73,0x73,0x69,0x62,0x6C,0x65,0x20,0x74,0x6F,0x20,0x63,0x6F,
	2013	+ 0x6C,0x6C,0x65,0x63,0x74,0x20,0x64,0x61,0x74,0x61,0x20,0x66,
	2014	+ 0x72,0x6F,0x6D,0x27,0x73,0x65,0x76,0x65,0x72,0x61,0x6C,0x20,
	2015	+ 0x6C,0x6F,0x63,0x61,0x74,0x69,0x6F,0x6E,0x73,0x20,0x69,0x6E,
	2016	+ 0x74,0x6F,0x20,0x74,0x68,0x65,0x20,0x63,0x6F,0x70,0x79,0x62,
	2017	+ 0x75,0x66,0x66,0x65,0x72,0x2E,0x29,0x00,0x03,0x45,0x4E,0x44,
	2018	+ 0x4C,0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2019	2019	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2020	2020	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2021	2021	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2022	2022	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2023	2023	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2024		− 0x2A,0x2A,0x2A,0x2A,0x4C,0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
	2024	+ 0x2A,0x2A,0x2A,0x2A,0x2A,0x4C,0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,
2025	2025	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2026	2026	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2027	2027	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2028	2028	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2029	2029	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2030		− 0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x0E,0x40,0x4C,
2031		− 0x50,0x72,0x6F,0x62,0x6C,0x65,0x6D,0x73,0x2F,0x46,0x41,0x51,
2032		− 0x06,0x3E,0x40,0x58,0x30,0x32,0x30,0x41,0x3E,0x40,0x43,0x30,
2033		− 0x30,0x31,0x51,0x3A,0x20,0x43,0x61,0x6E,0x20,0x49,0x20,0x6D,
2034		− 0x61,0x6B,0x65,0x20,0x66,0x75,0x6C,0x6C,0x73,0x63,0x72,0x65,
2035		− 0x65,0x6E,0x20,0x6D,0x6F,0x64,0x65,0x20,0x73,0x74,0x72,0x65,
2036		− 0x74,0x63,0x68,0x20,0x6F,0x75,0x74,0x20,0x74,0x68,0x65,0x20,
2037		− 0x77,0x68,0x6F,0x6C,0x65,0x20,0x73,0x63,0x72,0x65,0x65,0x6E,
2038		− 0x3F,0x3A,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,0x20,0x45,
2039		− 0x6E,0x61,0x62,0x6C,0x65,0x20,0x22,0x50,0x69,0x78,0x65,0x6C,
2040		− 0x20,0x66,0x69,0x6C,0x74,0x65,0x72,0x22,0x20,0x69,0x6E,0x20,
2041		− 0x43,0x6F,0x6E,0x66,0x69,0x67,0x20,0x2D,0x3E,0x20,0x4D,0x69,
2042		− 0x73,0x63,0x65,0x6C,0x6C,0x61,0x6E,0x65,0x6F,0x75,0x73,0x2E,
2043		− 0x4D,0x3E,0x40,0x58,0x30,0x33,0x35,0x49,0x74,0x20,0x77,0x6F,
2044		− 0x6E,0x27,0x74,0x20,0x6C,0x6F,0x6F,0x6B,0x20,0x70,0x72,0x65,
2045		− 0x74,0x74,0x79,0x2C,0x20,0x62,0x75,0x74,0x20,0x74,0x6F,0x20,
2046		− 0x73,0x6F,0x6D,0x65,0x20,0x70,0x65,0x6F,0x70,0x6C,0x65,0x20,
2047		− 0x69,0x74,0x27,0x73,0x20,0x6D,0x75,0x63,0x68,0x20,0x62,0x65,
2048		− 0x74,0x74,0x65,0x72,0x20,0x74,0x68,0x61,0x6E,0x20,0x6E,0x6F,
2049		− 0x74,0x68,0x69,0x6E,0x67,0x2E,0x06,0x3E,0x40,0x58,0x30,0x32,
2050		− 0x30,0x27,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,0x20,0x49,
2051		− 0x20,0x63,0x61,0x6E,0x27,0x74,0x20,0x75,0x73,0x65,0x20,0x41,
2052		− 0x4C,0x54,0x2B,0x46,0x34,0x20,0x61,0x6E,0x64,0x20,0x41,0x4C,
2053		− 0x54,0x2B,0x46,0x35,0x21,0x4E,0x3E,0x40,0x43,0x30,0x30,0x32,
2054		− 0x41,0x3A,0x20,0x57,0x69,0x6E,0x64,0x6F,0x77,0x73,0x3A,0x20,
2055		− 0x49,0x66,0x20,0x79,0x6F,0x75,0x20,0x68,0x61,0x76,0x65,0x20,
2056		− 0x47,0x65,0x46,0x6F,0x72,0x63,0x65,0x20,0x45,0x78,0x70,0x65,
2057		− 0x72,0x69,0x65,0x6E,0x63,0x65,0x20,0x69,0x6E,0x73,0x74,0x61,
2058		− 0x6C,0x6C,0x65,0x64,0x2C,0x20,0x79,0x6F,0x75,0x20,0x6E,0x65,
2059		− 0x65,0x64,0x20,0x74,0x6F,0x20,0x63,0x68,0x61,0x6E,0x67,0x65,
2060		− 0x2B,0x3E,0x40,0x58,0x30,0x33,0x35,0x74,0x68,0x65,0x20,0x6B,
2061		− 0x65,0x79,0x62,0x69,0x6E,0x64,0x69,0x6E,0x67,0x73,0x20,0x69,
2062		− 0x6E,0x20,0x69,0x74,0x73,0x20,0x73,0x65,0x74,0x74,0x69,0x6E,
2063		− 0x67,0x73,0x20,0x70,0x61,0x67,0x65,0x2E,0x56,0x6D,0x61,0x63,
2064		− 0x4F,0x53,0x2F,0x4F,0x53,0x20,0x58,0x3A,0x20,0x43,0x68,0x61,
2065		− 0x6E,0x67,0x65,0x20,0x41,0x4C,0x54,0x2B,0x46,0x34,0x2F,0x41,
2066		− 0x4C,0x54,0x2B,0x46,0x35,0x20,0x6B,0x65,0x79,0x73,0x20,0x69,
2067		− 0x6E,0x20,0x74,0x68,0x65,0x20,0x4F,0x53,0x20,0x74,0x6F,0x20,
2068		− 0x73,0x6F,0x6D,0x65,0x74,0x68,0x69,0x6E,0x67,0x20,0x65,0x6C,
2069		− 0x73,0x65,0x2E,0x20,0x41,0x6C,0x73,0x6F,0x20,0x66,0x6F,0x72,
2070		− 0x20,0x47,0x4E,0x55,0x2F,0x4C,0x69,0x6E,0x75,0x78,0x2E,0x06,
2071		− 0x3E,0x40,0x58,0x30,0x32,0x30,0x2B,0x3E,0x40,0x43,0x30,0x30,
2072		− 0x31,0x51,0x3A,0x20,0x54,0x68,0x65,0x20,0x6D,0x6F,0x75,0x73,
2073		− 0x65,0x20,0x63,0x75,0x72,0x73,0x6F,0x72,0x20,0x69,0x73,0x20,
2074		− 0x64,0x65,0x6C,0x61,0x79,0x65,0x64,0x2F,0x6C,0x61,0x67,0x67,
2075		− 0x79,0x21,0x44,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,0x20,
2076		− 0x4D,0x61,0x6B,0x65,0x20,0x73,0x75,0x72,0x65,0x20,0x22,0x53,
2077		− 0x6F,0x66,0x74,0x77,0x61,0x72,0x65,0x20,0x6D,0x6F,0x75,0x73,
2078		− 0x65,0x22,0x20,0x69,0x73,0x20,0x64,0x69,0x73,0x61,0x62,0x6C,
2079		− 0x65,0x64,0x20,0x69,0x6E,0x20,0x43,0x6F,0x6E,0x66,0x69,0x67,
2080		− 0x20,0x2D,0x3E,0x20,0x4C,0x61,0x79,0x6F,0x75,0x74,0x2E,0x4B,
2081		− 0x3E,0x40,0x58,0x30,0x33,0x35,0x41,0x6C,0x74,0x65,0x72,0x6E,
2082		− 0x61,0x74,0x69,0x76,0x65,0x6C,0x79,0x2C,0x20,0x79,0x6F,0x75,
2083		− 0x20,0x63,0x61,0x6E,0x20,0x65,0x6E,0x61,0x62,0x6C,0x65,0x20,
2084		− 0x22,0x56,0x53,0x79,0x6E,0x63,0x20,0x6F,0x66,0x66,0x22,0x20,
2085		− 0x69,0x6E,0x20,0x43,0x6F,0x6E,0x66,0x69,0x67,0x20,0x2D,0x3E,
2086		− 0x20,0x4D,0x69,0x73,0x63,0x65,0x6C,0x6C,0x61,0x6E,0x65,0x6F,
2087		− 0x75,0x73,0x2E,0x46,0x3E,0x54,0x68,0x69,0x73,0x20,0x68,0x6F,
2088		− 0x77,0x65,0x76,0x65,0x72,0x2C,0x20,0x77,0x69,0x6C,0x6C,0x20,
2089		− 0x69,0x6E,0x74,0x72,0x6F,0x64,0x75,0x63,0x65,0x20,0x73,0x74,
2090		− 0x75,0x74,0x74,0x65,0x72,0x69,0x6E,0x67,0x20,0x62,0x65,0x63,
2091		− 0x61,0x75,0x73,0x65,0x20,0x74,0x68,0x65,0x20,0x72,0x65,0x6E,
2092		− 0x64,0x65,0x72,0x69,0x6E,0x67,0x20,0x72,0x61,0x74,0x65,0x20,
2093		− 0x69,0x73,0x22,0x3E,0x6E,0x6F,0x74,0x20,0x65,0x78,0x61,0x63,
2094		− 0x74,0x20,0x74,0x6F,0x20,0x79,0x6F,0x75,0x72,0x20,0x6D,0x6F,
2095		− 0x6E,0x69,0x74,0x6F,0x72,0x27,0x73,0x20,0x72,0x61,0x74,0x65,
2096		− 0x2E,0x06,0x3E,0x40,0x58,0x30,0x32,0x30,0x33,0x3E,0x40,0x43,
2097		− 0x30,0x30,0x31,0x51,0x3A,0x20,0x57,0x69,0x6C,0x6C,0x20,0x79,
2098		− 0x6F,0x75,0x20,0x69,0x6D,0x70,0x6C,0x65,0x6D,0x65,0x6E,0x74,
2099		− 0x20,0x4D,0x49,0x44,0x49,0x20,0x6F,0x75,0x74,0x20,0x66,0x75,
2100		− 0x6E,0x63,0x74,0x69,0x6F,0x6E,0x61,0x6C,0x69,0x74,0x79,0x3F,
2101		− 0x4D,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,0x20,0x4E,0x6F,
2102		− 0x2C,0x20,0x73,0x6F,0x72,0x72,0x79,0x2E,0x20,0x54,0x68,0x69,
2103		− 0x73,0x20,0x69,0x73,0x20,0x76,0x65,0x72,0x79,0x20,0x64,0x69,
2104		− 0x66,0x66,0x69,0x63,0x75,0x6C,0x74,0x20,0x74,0x6F,0x20,0x69,
2105		− 0x6D,0x70,0x6C,0x65,0x6D,0x65,0x6E,0x74,0x20,0x63,0x6F,0x72,
2106		− 0x72,0x65,0x63,0x74,0x6C,0x79,0x20,0x77,0x68,0x65,0x6E,0x20,
2107		− 0x68,0x61,0x76,0x69,0x6E,0x67,0x3C,0x3E,0x40,0x58,0x30,0x33,
2108		− 0x35,0x68,0x69,0x67,0x68,0x65,0x72,0x20,0x61,0x75,0x64,0x69,
2109		− 0x6F,0x20,0x62,0x75,0x66,0x66,0x65,0x72,0x20,0x73,0x69,0x7A,
2110		− 0x65,0x73,0x20,0x28,0x62,0x75,0x66,0x66,0x65,0x72,0x65,0x64,
2111		− 0x20,0x72,0x65,0x70,0x6C,0x61,0x79,0x65,0x72,0x20,0x74,0x69,
2112		− 0x63,0x6B,0x73,0x29,0x2E,0x2E,0x2E,0x06,0x3E,0x40,0x58,0x30,
2113		− 0x32,0x30,0x30,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,0x20,
2114		− 0x57,0x68,0x65,0x72,0x65,0x20,0x69,0x73,0x20,0x74,0x68,0x65,
	2030	+ 0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x0E,0x40,
	2031	+ 0x4C,0x50,0x72,0x6F,0x62,0x6C,0x65,0x6D,0x73,0x2F,0x46,0x41,
	2032	+ 0x51,0x06,0x3E,0x40,0x58,0x30,0x32,0x30,0x41,0x3E,0x40,0x43,
	2033	+ 0x30,0x30,0x31,0x51,0x3A,0x20,0x43,0x61,0x6E,0x20,0x49,0x20,
	2034	+ 0x6D,0x61,0x6B,0x65,0x20,0x66,0x75,0x6C,0x6C,0x73,0x63,0x72,
	2035	+ 0x65,0x65,0x6E,0x20,0x6D,0x6F,0x64,0x65,0x20,0x73,0x74,0x72,
	2036	+ 0x65,0x74,0x63,0x68,0x20,0x6F,0x75,0x74,0x20,0x74,0x68,0x65,
	2037	+ 0x20,0x77,0x68,0x6F,0x6C,0x65,0x20,0x73,0x63,0x72,0x65,0x65,
	2038	+ 0x6E,0x3F,0x3A,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,0x20,
	2039	+ 0x45,0x6E,0x61,0x62,0x6C,0x65,0x20,0x22,0x50,0x69,0x78,0x65,
	2040	+ 0x6C,0x20,0x66,0x69,0x6C,0x74,0x65,0x72,0x22,0x20,0x69,0x6E,
	2041	+ 0x20,0x43,0x6F,0x6E,0x66,0x69,0x67,0x20,0x2D,0x3E,0x20,0x4D,
	2042	+ 0x69,0x73,0x63,0x65,0x6C,0x6C,0x61,0x6E,0x65,0x6F,0x75,0x73,
	2043	+ 0x2E,0x4D,0x3E,0x40,0x58,0x30,0x33,0x35,0x49,0x74,0x20,0x77,
	2044	+ 0x6F,0x6E,0x27,0x74,0x20,0x6C,0x6F,0x6F,0x6B,0x20,0x70,0x72,
	2045	+ 0x65,0x74,0x74,0x79,0x2C,0x20,0x62,0x75,0x74,0x20,0x74,0x6F,
	2046	+ 0x20,0x73,0x6F,0x6D,0x65,0x20,0x70,0x65,0x6F,0x70,0x6C,0x65,
	2047	+ 0x20,0x69,0x74,0x27,0x73,0x20,0x6D,0x75,0x63,0x68,0x20,0x62,
	2048	+ 0x65,0x74,0x74,0x65,0x72,0x20,0x74,0x68,0x61,0x6E,0x20,0x6E,
	2049	+ 0x6F,0x74,0x68,0x69,0x6E,0x67,0x2E,0x06,0x3E,0x40,0x58,0x30,
	2050	+ 0x32,0x30,0x27,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,0x20,
	2051	+ 0x49,0x20,0x63,0x61,0x6E,0x27,0x74,0x20,0x75,0x73,0x65,0x20,
	2052	+ 0x41,0x4C,0x54,0x2B,0x46,0x34,0x20,0x61,0x6E,0x64,0x20,0x41,
	2053	+ 0x4C,0x54,0x2B,0x46,0x35,0x21,0x4E,0x3E,0x40,0x43,0x30,0x30,
	2054	+ 0x32,0x41,0x3A,0x20,0x57,0x69,0x6E,0x64,0x6F,0x77,0x73,0x3A,
	2055	+ 0x20,0x49,0x66,0x20,0x79,0x6F,0x75,0x20,0x68,0x61,0x76,0x65,
	2056	+ 0x20,0x47,0x65,0x46,0x6F,0x72,0x63,0x65,0x20,0x45,0x78,0x70,
	2057	+ 0x65,0x72,0x69,0x65,0x6E,0x63,0x65,0x20,0x69,0x6E,0x73,0x74,
	2058	+ 0x61,0x6C,0x6C,0x65,0x64,0x2C,0x20,0x79,0x6F,0x75,0x20,0x6E,
	2059	+ 0x65,0x65,0x64,0x20,0x74,0x6F,0x20,0x63,0x68,0x61,0x6E,0x67,
	2060	+ 0x65,0x2B,0x3E,0x40,0x58,0x30,0x33,0x35,0x74,0x68,0x65,0x20,
	2061	+ 0x6B,0x65,0x79,0x62,0x69,0x6E,0x64,0x69,0x6E,0x67,0x73,0x20,
	2062	+ 0x69,0x6E,0x20,0x69,0x74,0x73,0x20,0x73,0x65,0x74,0x74,0x69,
	2063	+ 0x6E,0x67,0x73,0x20,0x70,0x61,0x67,0x65,0x2E,0x56,0x6D,0x61,
	2064	+ 0x63,0x4F,0x53,0x2F,0x4F,0x53,0x20,0x58,0x3A,0x20,0x43,0x68,
	2065	+ 0x61,0x6E,0x67,0x65,0x20,0x41,0x4C,0x54,0x2B,0x46,0x34,0x2F,
	2066	+ 0x41,0x4C,0x54,0x2B,0x46,0x35,0x20,0x6B,0x65,0x79,0x73,0x20,
	2067	+ 0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x4F,0x53,0x20,0x74,0x6F,
	2068	+ 0x20,0x73,0x6F,0x6D,0x65,0x74,0x68,0x69,0x6E,0x67,0x20,0x65,
	2069	+ 0x6C,0x73,0x65,0x2E,0x20,0x41,0x6C,0x73,0x6F,0x20,0x66,0x6F,
	2070	+ 0x72,0x20,0x47,0x4E,0x55,0x2F,0x4C,0x69,0x6E,0x75,0x78,0x2E,
	2071	+ 0x06,0x3E,0x40,0x58,0x30,0x32,0x30,0x2B,0x3E,0x40,0x43,0x30,
	2072	+ 0x30,0x31,0x51,0x3A,0x20,0x54,0x68,0x65,0x20,0x6D,0x6F,0x75,
	2073	+ 0x73,0x65,0x20,0x63,0x75,0x72,0x73,0x6F,0x72,0x20,0x69,0x73,
	2074	+ 0x20,0x64,0x65,0x6C,0x61,0x79,0x65,0x64,0x2F,0x6C,0x61,0x67,
	2075	+ 0x67,0x79,0x21,0x44,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,
	2076	+ 0x20,0x4D,0x61,0x6B,0x65,0x20,0x73,0x75,0x72,0x65,0x20,0x22,
	2077	+ 0x53,0x6F,0x66,0x74,0x77,0x61,0x72,0x65,0x20,0x6D,0x6F,0x75,
	2078	+ 0x73,0x65,0x22,0x20,0x69,0x73,0x20,0x64,0x69,0x73,0x61,0x62,
	2079	+ 0x6C,0x65,0x64,0x20,0x69,0x6E,0x20,0x43,0x6F,0x6E,0x66,0x69,
	2080	+ 0x67,0x20,0x2D,0x3E,0x20,0x4C,0x61,0x79,0x6F,0x75,0x74,0x2E,
	2081	+ 0x4B,0x3E,0x40,0x58,0x30,0x33,0x35,0x41,0x6C,0x74,0x65,0x72,
	2082	+ 0x6E,0x61,0x74,0x69,0x76,0x65,0x6C,0x79,0x2C,0x20,0x79,0x6F,
	2083	+ 0x75,0x20,0x63,0x61,0x6E,0x20,0x65,0x6E,0x61,0x62,0x6C,0x65,
	2084	+ 0x20,0x22,0x56,0x53,0x79,0x6E,0x63,0x20,0x6F,0x66,0x66,0x22,
	2085	+ 0x20,0x69,0x6E,0x20,0x43,0x6F,0x6E,0x66,0x69,0x67,0x20,0x2D,
	2086	+ 0x3E,0x20,0x4D,0x69,0x73,0x63,0x65,0x6C,0x6C,0x61,0x6E,0x65,
	2087	+ 0x6F,0x75,0x73,0x2E,0x46,0x3E,0x54,0x68,0x69,0x73,0x20,0x68,
	2088	+ 0x6F,0x77,0x65,0x76,0x65,0x72,0x2C,0x20,0x77,0x69,0x6C,0x6C,
	2089	+ 0x20,0x69,0x6E,0x74,0x72,0x6F,0x64,0x75,0x63,0x65,0x20,0x73,
	2090	+ 0x74,0x75,0x74,0x74,0x65,0x72,0x69,0x6E,0x67,0x20,0x62,0x65,
	2091	+ 0x63,0x61,0x75,0x73,0x65,0x20,0x74,0x68,0x65,0x20,0x72,0x65,
	2092	+ 0x6E,0x64,0x65,0x72,0x69,0x6E,0x67,0x20,0x72,0x61,0x74,0x65,
	2093	+ 0x20,0x69,0x73,0x22,0x3E,0x6E,0x6F,0x74,0x20,0x65,0x78,0x61,
	2094	+ 0x63,0x74,0x20,0x74,0x6F,0x20,0x79,0x6F,0x75,0x72,0x20,0x6D,
	2095	+ 0x6F,0x6E,0x69,0x74,0x6F,0x72,0x27,0x73,0x20,0x72,0x61,0x74,
	2096	+ 0x65,0x2E,0x06,0x3E,0x40,0x58,0x30,0x32,0x30,0x33,0x3E,0x40,
	2097	+ 0x43,0x30,0x30,0x31,0x51,0x3A,0x20,0x57,0x69,0x6C,0x6C,0x20,
	2098	+ 0x79,0x6F,0x75,0x20,0x69,0x6D,0x70,0x6C,0x65,0x6D,0x65,0x6E,
	2099	+ 0x74,0x20,0x4D,0x49,0x44,0x49,0x20,0x6F,0x75,0x74,0x20,0x66,
	2100	+ 0x75,0x6E,0x63,0x74,0x69,0x6F,0x6E,0x61,0x6C,0x69,0x74,0x79,
	2101	+ 0x3F,0x4D,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,0x20,0x4E,
	2102	+ 0x6F,0x2C,0x20,0x73,0x6F,0x72,0x72,0x79,0x2E,0x20,0x54,0x68,
	2103	+ 0x69,0x73,0x20,0x69,0x73,0x20,0x76,0x65,0x72,0x79,0x20,0x64,
	2104	+ 0x69,0x66,0x66,0x69,0x63,0x75,0x6C,0x74,0x20,0x74,0x6F,0x20,
	2105	+ 0x69,0x6D,0x70,0x6C,0x65,0x6D,0x65,0x6E,0x74,0x20,0x63,0x6F,
	2106	+ 0x72,0x72,0x65,0x63,0x74,0x6C,0x79,0x20,0x77,0x68,0x65,0x6E,
	2107	+ 0x20,0x68,0x61,0x76,0x69,0x6E,0x67,0x3C,0x3E,0x40,0x58,0x30,
	2108	+ 0x33,0x35,0x68,0x69,0x67,0x68,0x65,0x72,0x20,0x61,0x75,0x64,
	2109	+ 0x69,0x6F,0x20,0x62,0x75,0x66,0x66,0x65,0x72,0x20,0x73,0x69,
	2110	+ 0x7A,0x65,0x73,0x20,0x28,0x62,0x75,0x66,0x66,0x65,0x72,0x65,
	2111	+ 0x64,0x20,0x72,0x65,0x70,0x6C,0x61,0x79,0x65,0x72,0x20,0x74,
	2112	+ 0x69,0x63,0x6B,0x73,0x29,0x2E,0x2E,0x2E,0x06,0x3E,0x40,0x58,
	2113	+ 0x30,0x32,0x30,0x30,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,
	2114	+ 0x20,0x57,0x68,0x65,0x72,0x65,0x20,0x69,0x73,0x20,0x74,0x68,
	2115	+ 0x65,0x20,0x63,0x6F,0x6E,0x66,0x69,0x67,0x75,0x72,0x61,0x74,
	2116	+ 0x69,0x6F,0x6E,0x20,0x66,0x69,0x6C,0x65,0x20,0x73,0x74,0x6F,
	2117	+ 0x72,0x65,0x64,0x3F,0x3F,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,
	2118	+ 0x3A,0x20,0x57,0x69,0x6E,0x64,0x6F,0x77,0x73,0x3A,0x20,0x5C,
	2119	+ 0x55,0x73,0x65,0x72,0x73,0x5C,0x55,0x53,0x45,0x52,0x5C,0x41,
	2120	+ 0x70,0x70,0x44,0x61,0x74,0x61,0x5C,0x52,0x6F,0x61,0x6D,0x69,
	2121	+ 0x6E,0x67,0x5C,0x46,0x54,0x32,0x20,0x63,0x6C,0x6F,0x6E,0x65,
	2122	+ 0x5C,0x46,0x54,0x32,0x2E,0x43,0x46,0x47,0x45,0x3E,0x40,0x58,
	2123	+ 0x30,0x33,0x35,0x4F,0x53,0x20,0x58,0x3A,0x20,0x2F,0x55,0x73,
	2124	+ 0x65,0x72,0x73,0x2F,0x55,0x53,0x45,0x52,0x2F,0x4C,0x69,0x62,
	2125	+ 0x72,0x61,0x72,0x79,0x2F,0x41,0x70,0x70,0x6C,0x69,0x63,0x61,
	2126	+ 0x74,0x69,0x6F,0x6E,0x20,0x53,0x75,0x70,0x70,0x6F,0x72,0x74,
	2127	+ 0x2F,0x46,0x54,0x32,0x20,0x63,0x6C,0x6F,0x6E,0x65,0x2F,0x46,
	2128	+ 0x54,0x32,0x2E,0x43,0x46,0x47,0x2F,0x47,0x4E,0x55,0x2F,0x4C,
	2129	+ 0x69,0x6E,0x75,0x78,0x3A,0x20,0x2F,0x68,0x6F,0x6D,0x65,0x2F,
	2130	+ 0x55,0x53,0x45,0x52,0x2F,0x2E,0x63,0x6F,0x6E,0x66,0x69,0x67,
	2131	+ 0x2F,0x46,0x54,0x32,0x20,0x63,0x6C,0x6F,0x6E,0x65,0x2F,0x46,
	2132	+ 0x54,0x32,0x2E,0x43,0x46,0x47,0x01,0x3E,0x48,0x49,0x74,0x20,
	2133	+ 0x77,0x69,0x6C,0x6C,0x20,0x62,0x65,0x20,0x73,0x74,0x6F,0x72,
	2134	+ 0x65,0x64,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x70,0x72,
	2135	+ 0x6F,0x67,0x72,0x61,0x6D,0x20,0x64,0x69,0x72,0x65,0x63,0x74,
	2136	+ 0x6F,0x72,0x79,0x20,0x69,0x66,0x20,0x74,0x68,0x65,0x20,0x70,
	2137	+ 0x61,0x74,0x68,0x20,0x63,0x6F,0x75,0x6C,0x64,0x6E,0x27,0x74,
	2138	+ 0x20,0x62,0x65,0x20,0x75,0x73,0x65,0x64,0x2E,0x4D,0x49,0x66,
	2139	+ 0x20,0x79,0x6F,0x75,0x20,0x70,0x75,0x74,0x20,0x74,0x68,0x65,
2115	2140	0x20,0x63,0x6F,0x6E,0x66,0x69,0x67,0x75,0x72,0x61,0x74,0x69,
2116		− 0x6F,0x6E,0x20,0x66,0x69,0x6C,0x65,0x20,0x73,0x74,0x6F,0x72,
2117		− 0x65,0x64,0x3F,0x3F,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,
2118		− 0x20,0x57,0x69,0x6E,0x64,0x6F,0x77,0x73,0x3A,0x20,0x5C,0x55,
2119		− 0x73,0x65,0x72,0x73,0x5C,0x55,0x53,0x45,0x52,0x5C,0x41,0x70,
2120		− 0x70,0x44,0x61,0x74,0x61,0x5C,0x52,0x6F,0x61,0x6D,0x69,0x6E,
2121		− 0x67,0x5C,0x46,0x54,0x32,0x20,0x63,0x6C,0x6F,0x6E,0x65,0x5C,
2122		− 0x46,0x54,0x32,0x2E,0x43,0x46,0x47,0x45,0x3E,0x40,0x58,0x30,
2123		− 0x33,0x35,0x4F,0x53,0x20,0x58,0x3A,0x20,0x2F,0x55,0x73,0x65,
2124		− 0x72,0x73,0x2F,0x55,0x53,0x45,0x52,0x2F,0x4C,0x69,0x62,0x72,
2125		− 0x61,0x72,0x79,0x2F,0x41,0x70,0x70,0x6C,0x69,0x63,0x61,0x74,
2126		− 0x69,0x6F,0x6E,0x20,0x53,0x75,0x70,0x70,0x6F,0x72,0x74,0x2F,
2127		− 0x46,0x54,0x32,0x20,0x63,0x6C,0x6F,0x6E,0x65,0x2F,0x46,0x54,
2128		− 0x32,0x2E,0x43,0x46,0x47,0x2F,0x47,0x4E,0x55,0x2F,0x4C,0x69,
2129		− 0x6E,0x75,0x78,0x3A,0x20,0x2F,0x68,0x6F,0x6D,0x65,0x2F,0x55,
2130		− 0x53,0x45,0x52,0x2F,0x2E,0x63,0x6F,0x6E,0x66,0x69,0x67,0x2F,
2131		− 0x46,0x54,0x32,0x20,0x63,0x6C,0x6F,0x6E,0x65,0x2F,0x46,0x54,
2132		− 0x32,0x2E,0x43,0x46,0x47,0x01,0x3E,0x48,0x49,0x74,0x20,0x77,
2133		− 0x69,0x6C,0x6C,0x20,0x62,0x65,0x20,0x73,0x74,0x6F,0x72,0x65,
2134		− 0x64,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,0x70,0x72,0x6F,
2135		− 0x67,0x72,0x61,0x6D,0x20,0x64,0x69,0x72,0x65,0x63,0x74,0x6F,
2136		− 0x72,0x79,0x20,0x69,0x66,0x20,0x74,0x68,0x65,0x20,0x70,0x61,
2137		− 0x74,0x68,0x20,0x63,0x6F,0x75,0x6C,0x64,0x6E,0x27,0x74,0x20,
2138		− 0x62,0x65,0x20,0x75,0x73,0x65,0x64,0x2E,0x4D,0x49,0x66,0x20,
2139		− 0x79,0x6F,0x75,0x20,0x70,0x75,0x74,0x20,0x74,0x68,0x65,0x20,
2140		− 0x63,0x6F,0x6E,0x66,0x69,0x67,0x75,0x72,0x61,0x74,0x69,0x6F,
2141		− 0x6E,0x20,0x66,0x69,0x6C,0x65,0x20,0x69,0x6E,0x20,0x74,0x68,
2142		− 0x65,0x20,0x70,0x72,0x6F,0x67,0x72,0x61,0x6D,0x20,0x64,0x69,
2143		− 0x72,0x65,0x63,0x74,0x6F,0x72,0x79,0x2C,0x20,0x69,0x74,0x20,
2144		− 0x77,0x69,0x6C,0x6C,0x20,0x72,0x65,0x61,0x64,0x20,0x74,0x68,
2145		− 0x61,0x74,0x4A,0x6F,0x6E,0x65,0x20,0x61,0x6E,0x64,0x20,0x6E,
2146		− 0x6F,0x74,0x20,0x61,0x74,0x74,0x65,0x6D,0x70,0x74,0x20,0x74,
2147		− 0x6F,0x20,0x63,0x72,0x65,0x61,0x74,0x65,0x20,0x63,0x6F,0x6E,
2148		− 0x66,0x69,0x67,0x20,0x64,0x69,0x72,0x73,0x20,0x66,0x6F,0x72,
2149		− 0x20,0x74,0x68,0x65,0x20,0x4F,0x53,0x20,0x75,0x73,0x65,0x72,
2150		− 0x2E,0x20,0x28,0x70,0x6F,0x72,0x74,0x61,0x62,0x6C,0x65,0x20,
2151		− 0x6D,0x6F,0x64,0x65,0x29,0x06,0x3E,0x40,0x58,0x30,0x32,0x30,
2152		− 0x42,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,0x20,0x43,0x61,
2153		− 0x6E,0x20,0x74,0x68,0x65,0x20,0x63,0x6C,0x6F,0x6E,0x65,0x20,
2154		− 0x72,0x65,0x61,0x64,0x20,0x46,0x54,0x32,0x2E,0x43,0x46,0x47,
2155		− 0x20,0x66,0x72,0x6F,0x6D,0x20,0x72,0x65,0x61,0x6C,0x20,0x46,
2156		− 0x54,0x32,0x2C,0x20,0x61,0x6E,0x64,0x20,0x76,0x69,0x63,0x65,
2157		− 0x20,0x76,0x65,0x72,0x73,0x61,0x3F,0x4C,0x3E,0x40,0x43,0x30,
2158		− 0x30,0x32,0x41,0x3A,0x20,0x59,0x65,0x73,0x2C,0x20,0x69,0x74,
2159		− 0x20,0x73,0x68,0x6F,0x75,0x6C,0x64,0x20,0x77,0x6F,0x72,0x6B,
2160		− 0x20,0x6A,0x75,0x73,0x74,0x20,0x66,0x69,0x6E,0x65,0x2E,0x20,
2161		− 0x50,0x75,0x74,0x20,0x69,0x74,0x20,0x69,0x6E,0x20,0x74,0x68,
2162		− 0x65,0x20,0x64,0x69,0x72,0x65,0x63,0x74,0x6F,0x72,0x79,0x20,
2163		− 0x73,0x68,0x6F,0x77,0x6E,0x20,0x61,0x62,0x6F,0x76,0x65,0x2E,
2164		− 0x06,0x3E,0x40,0x58,0x30,0x32,0x30,0x52,0x3E,0x40,0x43,0x30,
2165		− 0x30,0x31,0x51,0x3A,0x20,0x53,0x6D,0x70,0x2E,0x20,0x45,0x64,
2166		− 0x2E,0x3A,0x20,0x57,0x68,0x69,0x6C,0x65,0x20,0x7A,0x6F,0x6F,
2167		− 0x6D,0x69,0x6E,0x67,0x20,0x69,0x6E,0x2C,0x20,0x49,0x20,0x73,
2168		− 0x6F,0x6D,0x65,0x74,0x69,0x6D,0x65,0x73,0x20,0x63,0x61,0x6E,
2169		− 0x27,0x74,0x20,0x6D,0x61,0x72,0x6B,0x20,0x74,0x68,0x65,0x20,
2170		− 0x6C,0x61,0x73,0x74,0x20,0x73,0x61,0x6D,0x70,0x6C,0x65,0x20,
2171		− 0x70,0x6F,0x69,0x6E,0x74,0x21,0x47,0x3E,0x40,0x43,0x30,0x30,
2172		− 0x32,0x41,0x3A,0x20,0x54,0x68,0x69,0x73,0x20,0x69,0x73,0x20,
2173		− 0x6E,0x6F,0x72,0x6D,0x61,0x6C,0x2E,0x20,0x54,0x68,0x69,0x73,
2174		− 0x20,0x69,0x73,0x20,0x61,0x20,0x6C,0x69,0x6D,0x69,0x74,0x61,
2175		− 0x74,0x69,0x6F,0x6E,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,0x20,
2176		− 0x6E,0x61,0x74,0x75,0x72,0x65,0x20,0x6F,0x66,0x20,0x73,0x63,
2177		− 0x61,0x6C,0x69,0x6E,0x67,0x2E,0x06,0x3E,0x40,0x58,0x30,0x32,
2178		− 0x30,0x17,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,0x20,0x49,
2179		− 0x20,0x66,0x6F,0x75,0x6E,0x64,0x20,0x61,0x20,0x62,0x75,0x67,
2180		− 0x21,0x4C,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,0x20,0x50,
2181		− 0x6C,0x65,0x61,0x73,0x65,0x20,0x73,0x65,0x6E,0x64,0x20,0x6D,
2182		− 0x65,0x20,0x61,0x20,0x6D,0x61,0x69,0x6C,0x20,0x28,0x66,0x6F,
2183		− 0x75,0x6E,0x64,0x20,0x61,0x74,0x20,0x31,0x36,0x2D,0x62,0x69,
2184		− 0x74,0x73,0x2E,0x6F,0x72,0x67,0x29,0x20,0x61,0x6E,0x64,0x20,
2185		− 0x74,0x72,0x79,0x20,0x74,0x6F,0x20,0x65,0x78,0x70,0x6C,0x61,
2186		− 0x69,0x6E,0x20,0x69,0x74,0x2E,0x00,0x03,0x45,0x4E,0x44,0x4C,
2187		− 0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
	2141	+ 0x6F,0x6E,0x20,0x66,0x69,0x6C,0x65,0x20,0x69,0x6E,0x20,0x74,
	2142	+ 0x68,0x65,0x20,0x70,0x72,0x6F,0x67,0x72,0x61,0x6D,0x20,0x64,
	2143	+ 0x69,0x72,0x65,0x63,0x74,0x6F,0x72,0x79,0x2C,0x20,0x69,0x74,
	2144	+ 0x20,0x77,0x69,0x6C,0x6C,0x20,0x72,0x65,0x61,0x64,0x20,0x74,
	2145	+ 0x68,0x61,0x74,0x4A,0x6F,0x6E,0x65,0x20,0x61,0x6E,0x64,0x20,
	2146	+ 0x6E,0x6F,0x74,0x20,0x61,0x74,0x74,0x65,0x6D,0x70,0x74,0x20,
	2147	+ 0x74,0x6F,0x20,0x63,0x72,0x65,0x61,0x74,0x65,0x20,0x63,0x6F,
	2148	+ 0x6E,0x66,0x69,0x67,0x20,0x64,0x69,0x72,0x73,0x20,0x66,0x6F,
	2149	+ 0x72,0x20,0x74,0x68,0x65,0x20,0x4F,0x53,0x20,0x75,0x73,0x65,
	2150	+ 0x72,0x2E,0x20,0x28,0x70,0x6F,0x72,0x74,0x61,0x62,0x6C,0x65,
	2151	+ 0x20,0x6D,0x6F,0x64,0x65,0x29,0x06,0x3E,0x40,0x58,0x30,0x32,
	2152	+ 0x30,0x42,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,0x20,0x43,
	2153	+ 0x61,0x6E,0x20,0x74,0x68,0x65,0x20,0x63,0x6C,0x6F,0x6E,0x65,
	2154	+ 0x20,0x72,0x65,0x61,0x64,0x20,0x46,0x54,0x32,0x2E,0x43,0x46,
	2155	+ 0x47,0x20,0x66,0x72,0x6F,0x6D,0x20,0x72,0x65,0x61,0x6C,0x20,
	2156	+ 0x46,0x54,0x32,0x2C,0x20,0x61,0x6E,0x64,0x20,0x76,0x69,0x63,
	2157	+ 0x65,0x20,0x76,0x65,0x72,0x73,0x61,0x3F,0x4C,0x3E,0x40,0x43,
	2158	+ 0x30,0x30,0x32,0x41,0x3A,0x20,0x59,0x65,0x73,0x2C,0x20,0x69,
	2159	+ 0x74,0x20,0x73,0x68,0x6F,0x75,0x6C,0x64,0x20,0x77,0x6F,0x72,
	2160	+ 0x6B,0x20,0x6A,0x75,0x73,0x74,0x20,0x66,0x69,0x6E,0x65,0x2E,
	2161	+ 0x20,0x50,0x75,0x74,0x20,0x69,0x74,0x20,0x69,0x6E,0x20,0x74,
	2162	+ 0x68,0x65,0x20,0x64,0x69,0x72,0x65,0x63,0x74,0x6F,0x72,0x79,
	2163	+ 0x20,0x73,0x68,0x6F,0x77,0x6E,0x20,0x61,0x62,0x6F,0x76,0x65,
	2164	+ 0x2E,0x06,0x3E,0x40,0x58,0x30,0x32,0x30,0x52,0x3E,0x40,0x43,
	2165	+ 0x30,0x30,0x31,0x51,0x3A,0x20,0x53,0x6D,0x70,0x2E,0x20,0x45,
	2166	+ 0x64,0x2E,0x3A,0x20,0x57,0x68,0x69,0x6C,0x65,0x20,0x7A,0x6F,
	2167	+ 0x6F,0x6D,0x69,0x6E,0x67,0x20,0x69,0x6E,0x2C,0x20,0x49,0x20,
	2168	+ 0x73,0x6F,0x6D,0x65,0x74,0x69,0x6D,0x65,0x73,0x20,0x63,0x61,
	2169	+ 0x6E,0x27,0x74,0x20,0x6D,0x61,0x72,0x6B,0x20,0x74,0x68,0x65,
	2170	+ 0x20,0x6C,0x61,0x73,0x74,0x20,0x73,0x61,0x6D,0x70,0x6C,0x65,
	2171	+ 0x20,0x70,0x6F,0x69,0x6E,0x74,0x21,0x47,0x3E,0x40,0x43,0x30,
	2172	+ 0x30,0x32,0x41,0x3A,0x20,0x54,0x68,0x69,0x73,0x20,0x69,0x73,
	2173	+ 0x20,0x6E,0x6F,0x72,0x6D,0x61,0x6C,0x2E,0x20,0x54,0x68,0x69,
	2174	+ 0x73,0x20,0x69,0x73,0x20,0x61,0x20,0x6C,0x69,0x6D,0x69,0x74,
	2175	+ 0x61,0x74,0x69,0x6F,0x6E,0x20,0x69,0x6E,0x20,0x74,0x68,0x65,
	2176	+ 0x20,0x6E,0x61,0x74,0x75,0x72,0x65,0x20,0x6F,0x66,0x20,0x73,
	2177	+ 0x63,0x61,0x6C,0x69,0x6E,0x67,0x2E,0x06,0x3E,0x40,0x58,0x30,
	2178	+ 0x32,0x30,0x17,0x3E,0x40,0x43,0x30,0x30,0x31,0x51,0x3A,0x20,
	2179	+ 0x49,0x20,0x66,0x6F,0x75,0x6E,0x64,0x20,0x61,0x20,0x62,0x75,
	2180	+ 0x67,0x21,0x4C,0x3E,0x40,0x43,0x30,0x30,0x32,0x41,0x3A,0x20,
	2181	+ 0x50,0x6C,0x65,0x61,0x73,0x65,0x20,0x73,0x65,0x6E,0x64,0x20,
	2182	+ 0x6D,0x65,0x20,0x61,0x20,0x6D,0x61,0x69,0x6C,0x20,0x28,0x66,
	2183	+ 0x6F,0x75,0x6E,0x64,0x20,0x61,0x74,0x20,0x31,0x36,0x2D,0x62,
	2184	+ 0x69,0x74,0x73,0x2E,0x6F,0x72,0x67,0x29,0x20,0x61,0x6E,0x64,
	2185	+ 0x20,0x74,0x72,0x79,0x20,0x74,0x6F,0x20,0x65,0x78,0x70,0x6C,
	2186	+ 0x61,0x69,0x6E,0x20,0x69,0x74,0x2E,0x00,0x03,0x45,0x4E,0x44,
	2187	+ 0x4C,0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2188	2188	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2189	2189	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2190	2190	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2191	2191	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2192	2192	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2193		− 0x2A,0x2A,0x2A,0x2A,0x4C,0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
	2193	+ 0x2A,0x2A,0x2A,0x2A,0x2A,0x4C,0x3B,0x2A,0x2A,0x2A,0x2A,0x2A,
2194	2194	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2195	2195	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2196	2196	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2197	2197	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2198	2198	0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,
2199		− 0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x0C,0x40,0x4C,
2200		− 0x4B,0x6E,0x6F,0x77,0x6E,0x20,0x62,0x75,0x67,0x73,0x06,0x3E,
2201		− 0x40,0x58,0x30,0x31,0x30,0x2C,0x3E,0x40,0x43,0x30,0x30,0x31,
2202		− 0x57,0x41,0x56,0x20,0x65,0x78,0x70,0x6F,0x72,0x74,0x69,0x6E,
2203		− 0x67,0x20,0x28,0x72,0x65,0x6E,0x64,0x65,0x72,0x69,0x6E,0x67,
2204		− 0x20,0x73,0x6F,0x6E,0x67,0x20,0x74,0x6F,0x20,0x57,0x41,0x56,
2205		− 0x29,0x3A,0x01,0x3E,0x50,0x3E,0x40,0x43,0x30,0x30,0x32,0x2D,
2206		− 0x20,0x53,0x6F,0x6E,0x67,0x73,0x20,0x74,0x68,0x61,0x74,0x20,
2207		− 0x6A,0x75,0x6D,0x70,0x20,0x62,0x61,0x63,0x6B,0x20,0x74,0x6F,
2208		− 0x20,0x61,0x20,0x70,0x72,0x65,0x76,0x69,0x6F,0x75,0x73,0x20,
2209		− 0x70,0x61,0x74,0x74,0x65,0x72,0x6E,0x20,0x77,0x69,0x6C,0x6C,
2210		− 0x20,0x72,0x65,0x6E,0x64,0x65,0x72,0x20,0x66,0x6F,0x72,0x65,
2211		− 0x76,0x65,0x72,0x20,0x61,0x6E,0x64,0x20,0x65,0x76,0x65,0x72,
2212		− 0x2C,0x50,0x61,0x6E,0x64,0x20,0x79,0x6F,0x75,0x20,0x6E,0x65,
2213		− 0x65,0x64,0x20,0x74,0x6F,0x20,0x70,0x72,0x65,0x73,0x73,0x20,
2214		− 0x61,0x20,0x6B,0x65,0x79,0x20,0x6F,0x72,0x20,0x63,0x6C,0x69,
2215		− 0x63,0x6B,0x20,0x74,0x68,0x65,0x20,0x6D,0x6F,0x75,0x73,0x65,
2216		− 0x20,0x74,0x6F,0x20,0x61,0x62,0x6F,0x72,0x74,0x20,0x74,0x68,
2217		− 0x65,0x20,0x72,0x65,0x6E,0x64,0x65,0x72,0x20,0x77,0x68,0x65,
2218		− 0x6E,0x20,0x79,0x6F,0x75,0x20,0x77,0x61,0x6E,0x74,0x06,0x69,
2219		− 0x74,0x20,0x74,0x6F,0x2E,0x06,0x3E,0x40,0x58,0x30,0x31,0x30,
2220		− 0x17,0x3E,0x40,0x43,0x30,0x30,0x31,0x4D,0x6F,0x75,0x73,0x65,
2221		− 0x20,0x2F,0x20,0x6B,0x65,0x79,0x62,0x6F,0x61,0x72,0x64,0x3A,
2222		− 0x01,0x3E,0x43,0x3E,0x40,0x43,0x30,0x30,0x32,0x2D,0x20,0x4C,
2223		− 0x69,0x6E,0x75,0x78,0x3A,0x20,0x54,0x68,0x65,0x20,0x6D,0x6F,
2224		− 0x75,0x73,0x65,0x20,0x63,0x75,0x72,0x73,0x6F,0x72,0x20,0x67,
2225		− 0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x20,0x63,0x61,0x6E,0x20,
2226		− 0x62,0x65,0x20,0x67,0x6C,0x69,0x74,0x63,0x68,0x79,0x20,0x61,
2227		− 0x74,0x20,0x74,0x69,0x6D,0x65,0x73,0x2E,0x2E,0x2E,0x06,0x3E,
2228		− 0x40,0x58,0x30,0x31,0x30,0x0C,0x3E,0x40,0x43,0x30,0x30,0x31,
2229		− 0x56,0x69,0x64,0x65,0x6F,0x3A,0x06,0x3E,0x40,0x43,0x30,0x30,
2230		− 0x32,0x50,0x3E,0x40,0x58,0x30,0x31,0x30,0x2D,0x20,0x46,0x75,
2231		− 0x6C,0x6C,0x73,0x63,0x72,0x65,0x65,0x6E,0x20,0x6D,0x6F,0x64,
2232		− 0x65,0x20,0x63,0x61,0x6E,0x20,0x62,0x65,0x20,0x75,0x6E,0x62,
2233		− 0x65,0x61,0x72,0x61,0x62,0x6C,0x79,0x20,0x73,0x6C,0x6F,0x77,
2234		− 0x20,0x6F,0x6E,0x20,0x61,0x20,0x52,0x61,0x73,0x70,0x62,0x65,
2235		− 0x72,0x72,0x79,0x20,0x50,0x69,0x20,0x28,0x65,0x76,0x65,0x6E,
2236		− 0x20,0x6F,0x6E,0x20,0x52,0x50,0x69,0x20,0x34,0x29,0x01,0x3E,
2237		− 0x52,0x3E,0x40,0x58,0x30,0x31,0x30,0x2D,0x20,0x4E,0x6F,0x74,
2238		− 0x20,0x61,0x20,0x62,0x75,0x67,0x2C,0x20,0x62,0x75,0x74,0x20,
2239		− 0x69,0x66,0x20,0x79,0x6F,0x75,0x72,0x20,0x6D,0x6F,0x6E,0x69,
2240		− 0x74,0x6F,0x72,0x27,0x73,0x20,0x72,0x65,0x66,0x72,0x65,0x73,
2241		− 0x68,0x20,0x72,0x61,0x74,0x65,0x20,0x69,0x73,0x20,0x6E,0x6F,
2242		− 0x74,0x20,0x73,0x65,0x74,0x20,0x74,0x6F,0x20,0x36,0x30,0x48,
2243		− 0x7A,0x20,0x28,0x6F,0x72,0x20,0x35,0x39,0x48,0x7A,0x29,0x4F,
2244		− 0x3E,0x40,0x58,0x30,0x32,0x31,0x79,0x6F,0x75,0x20,0x6D,0x61,
2245		− 0x79,0x20,0x65,0x78,0x70,0x65,0x72,0x69,0x65,0x6E,0x63,0x65,
2246		− 0x20,0x76,0x69,0x73,0x75,0x61,0x6C,0x20,0x73,0x74,0x75,0x74,
2247		− 0x74,0x65,0x72,0x69,0x6E,0x67,0x20,0x62,0x65,0x63,0x61,0x75,
2248		− 0x73,0x65,0x20,0x56,0x53,0x79,0x6E,0x63,0x20,0x77,0x69,0x6C,
2249		− 0x6C,0x20,0x6E,0x6F,0x74,0x20,0x62,0x65,0x20,0x75,0x73,0x65,
2250		− 0x64,0x20,0x74,0x68,0x65,0x6E,0x2E,0x51,0x49,0x20,0x68,0x69,
2251		− 0x67,0x68,0x6C,0x79,0x20,0x72,0x65,0x63,0x6F,0x6D,0x6D,0x65,
2252		− 0x6E,0x64,0x20,0x72,0x75,0x6E,0x6E,0x69,0x6E,0x67,0x20,0x79,
2253		− 0x6F,0x75,0x72,0x20,0x6D,0x6F,0x6E,0x69,0x74,0x6F,0x72,0x20,
2254		− 0x61,0x74,0x20,0x36,0x30,0x48,0x7A,0x20,0x69,0x66,0x20,0x79,
2255		− 0x6F,0x75,0x27,0x72,0x65,0x20,0x61,0x20,0x68,0x61,0x72,0x64,
2256		− 0x63,0x6F,0x72,0x65,0x20,0x75,0x73,0x65,0x72,0x20,0x6F,0x66,
2257		− 0x20,0x74,0x68,0x69,0x73,0x08,0x70,0x72,0x6F,0x67,0x72,0x61,
2258		− 0x6D,0x2E,0x00,0x03,0x45,0x4E,0x44
	2199	+ 0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x2A,0x0C,0x40,
	2200	+ 0x4C,0x4B,0x6E,0x6F,0x77,0x6E,0x20,0x62,0x75,0x67,0x73,0x06,
	2201	+ 0x3E,0x40,0x58,0x30,0x31,0x30,0x2C,0x3E,0x40,0x43,0x30,0x30,
	2202	+ 0x31,0x57,0x41,0x56,0x20,0x65,0x78,0x70,0x6F,0x72,0x74,0x69,
	2203	+ 0x6E,0x67,0x20,0x28,0x72,0x65,0x6E,0x64,0x65,0x72,0x69,0x6E,
	2204	+ 0x67,0x20,0x73,0x6F,0x6E,0x67,0x20,0x74,0x6F,0x20,0x57,0x41,
	2205	+ 0x56,0x29,0x3A,0x01,0x3E,0x50,0x3E,0x40,0x43,0x30,0x30,0x32,
	2206	+ 0x2D,0x20,0x53,0x6F,0x6E,0x67,0x73,0x20,0x74,0x68,0x61,0x74,
	2207	+ 0x20,0x6A,0x75,0x6D,0x70,0x20,0x62,0x61,0x63,0x6B,0x20,0x74,
	2208	+ 0x6F,0x20,0x61,0x20,0x70,0x72,0x65,0x76,0x69,0x6F,0x75,0x73,
	2209	+ 0x20,0x70,0x61,0x74,0x74,0x65,0x72,0x6E,0x20,0x77,0x69,0x6C,
	2210	+ 0x6C,0x20,0x72,0x65,0x6E,0x64,0x65,0x72,0x20,0x66,0x6F,0x72,
	2211	+ 0x65,0x76,0x65,0x72,0x20,0x61,0x6E,0x64,0x20,0x65,0x76,0x65,
	2212	+ 0x72,0x2C,0x50,0x61,0x6E,0x64,0x20,0x79,0x6F,0x75,0x20,0x6E,
	2213	+ 0x65,0x65,0x64,0x20,0x74,0x6F,0x20,0x70,0x72,0x65,0x73,0x73,
	2214	+ 0x20,0x61,0x20,0x6B,0x65,0x79,0x20,0x6F,0x72,0x20,0x63,0x6C,
	2215	+ 0x69,0x63,0x6B,0x20,0x74,0x68,0x65,0x20,0x6D,0x6F,0x75,0x73,
	2216	+ 0x65,0x20,0x74,0x6F,0x20,0x61,0x62,0x6F,0x72,0x74,0x20,0x74,
	2217	+ 0x68,0x65,0x20,0x72,0x65,0x6E,0x64,0x65,0x72,0x20,0x77,0x68,
	2218	+ 0x65,0x6E,0x20,0x79,0x6F,0x75,0x20,0x77,0x61,0x6E,0x74,0x06,
	2219	+ 0x69,0x74,0x20,0x74,0x6F,0x2E,0x06,0x3E,0x40,0x58,0x30,0x31,
	2220	+ 0x30,0x17,0x3E,0x40,0x43,0x30,0x30,0x31,0x4D,0x6F,0x75,0x73,
	2221	+ 0x65,0x20,0x2F,0x20,0x6B,0x65,0x79,0x62,0x6F,0x61,0x72,0x64,
	2222	+ 0x3A,0x01,0x3E,0x43,0x3E,0x40,0x43,0x30,0x30,0x32,0x2D,0x20,
	2223	+ 0x4C,0x69,0x6E,0x75,0x78,0x3A,0x20,0x54,0x68,0x65,0x20,0x6D,
	2224	+ 0x6F,0x75,0x73,0x65,0x20,0x63,0x75,0x72,0x73,0x6F,0x72,0x20,
	2225	+ 0x67,0x72,0x61,0x70,0x68,0x69,0x63,0x73,0x20,0x63,0x61,0x6E,
	2226	+ 0x20,0x62,0x65,0x20,0x67,0x6C,0x69,0x74,0x63,0x68,0x79,0x20,
	2227	+ 0x61,0x74,0x20,0x74,0x69,0x6D,0x65,0x73,0x2E,0x2E,0x2E,0x06,
	2228	+ 0x3E,0x40,0x58,0x30,0x31,0x30,0x0C,0x3E,0x40,0x43,0x30,0x30,
	2229	+ 0x31,0x56,0x69,0x64,0x65,0x6F,0x3A,0x06,0x3E,0x40,0x43,0x30,
	2230	+ 0x30,0x32,0x50,0x3E,0x40,0x58,0x30,0x31,0x30,0x2D,0x20,0x46,
	2231	+ 0x75,0x6C,0x6C,0x73,0x63,0x72,0x65,0x65,0x6E,0x20,0x6D,0x6F,
	2232	+ 0x64,0x65,0x20,0x63,0x61,0x6E,0x20,0x62,0x65,0x20,0x75,0x6E,
	2233	+ 0x62,0x65,0x61,0x72,0x61,0x62,0x6C,0x79,0x20,0x73,0x6C,0x6F,
	2234	+ 0x77,0x20,0x6F,0x6E,0x20,0x61,0x20,0x52,0x61,0x73,0x70,0x62,
	2235	+ 0x65,0x72,0x72,0x79,0x20,0x50,0x69,0x20,0x28,0x65,0x76,0x65,
	2236	+ 0x6E,0x20,0x6F,0x6E,0x20,0x52,0x50,0x69,0x20,0x34,0x29,0x01,
	2237	+ 0x3E,0x52,0x3E,0x40,0x58,0x30,0x31,0x30,0x2D,0x20,0x4E,0x6F,
	2238	+ 0x74,0x20,0x61,0x20,0x62,0x75,0x67,0x2C,0x20,0x62,0x75,0x74,
	2239	+ 0x20,0x69,0x66,0x20,0x79,0x6F,0x75,0x72,0x20,0x6D,0x6F,0x6E,
	2240	+ 0x69,0x74,0x6F,0x72,0x27,0x73,0x20,0x72,0x65,0x66,0x72,0x65,
	2241	+ 0x73,0x68,0x20,0x72,0x61,0x74,0x65,0x20,0x69,0x73,0x20,0x6E,
	2242	+ 0x6F,0x74,0x20,0x73,0x65,0x74,0x20,0x74,0x6F,0x20,0x36,0x30,
	2243	+ 0x48,0x7A,0x20,0x28,0x6F,0x72,0x20,0x35,0x39,0x48,0x7A,0x29,
	2244	+ 0x4F,0x3E,0x40,0x58,0x30,0x32,0x31,0x79,0x6F,0x75,0x20,0x6D,
	2245	+ 0x61,0x79,0x20,0x65,0x78,0x70,0x65,0x72,0x69,0x65,0x6E,0x63,
	2246	+ 0x65,0x20,0x76,0x69,0x73,0x75,0x61,0x6C,0x20,0x73,0x74,0x75,
	2247	+ 0x74,0x74,0x65,0x72,0x69,0x6E,0x67,0x20,0x62,0x65,0x63,0x61,
	2248	+ 0x75,0x73,0x65,0x20,0x56,0x53,0x79,0x6E,0x63,0x20,0x77,0x69,
	2249	+ 0x6C,0x6C,0x20,0x6E,0x6F,0x74,0x20,0x62,0x65,0x20,0x75,0x73,
	2250	+ 0x65,0x64,0x20,0x74,0x68,0x65,0x6E,0x2E,0x51,0x49,0x20,0x68,
	2251	+ 0x69,0x67,0x68,0x6C,0x79,0x20,0x72,0x65,0x63,0x6F,0x6D,0x6D,
	2252	+ 0x65,0x6E,0x64,0x20,0x72,0x75,0x6E,0x6E,0x69,0x6E,0x67,0x20,
	2253	+ 0x79,0x6F,0x75,0x72,0x20,0x6D,0x6F,0x6E,0x69,0x74,0x6F,0x72,
	2254	+ 0x20,0x61,0x74,0x20,0x36,0x30,0x48,0x7A,0x20,0x69,0x66,0x20,
	2255	+ 0x79,0x6F,0x75,0x27,0x72,0x65,0x20,0x61,0x20,0x68,0x61,0x72,
	2256	+ 0x64,0x63,0x6F,0x72,0x65,0x20,0x75,0x73,0x65,0x72,0x20,0x6F,
	2257	+ 0x66,0x20,0x74,0x68,0x69,0x73,0x08,0x70,0x72,0x6F,0x67,0x72,
	2258	+ 0x61,0x6D,0x2E,0x00,0x03,0x45,0x4E,0x44
2259	2259	};
2260	2260
2261	2261	#endif

src/mixer/ft2_center_mix.c+166−166

@@ -13,7 +13,7 @@ · 12 unmodified lines
13	13	void centerMix8bNoLoop(voice_t *v, uint32_t numSamples)
14	14	{
15	15	const int8_t base, smpPtr;
16		− float fSample, fMixBufferL, fMixBufferR;
	16	+ double dSample, dMixBufferL, dMixBufferR;
17	17	int32_t pos;
18	18	uint32_t i, samplesToMix, samplesLeft;
19	19	uint64_t posFrac;
@@ -55,7 +55,7 @@ void centerMix8bNoLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
55	55	void centerMix8bLoop(voice_t *v, uint32_t numSamples)
56	56	{
57	57	const int8_t base, smpPtr;
58		− float fSample, fMixBufferL, fMixBufferR;
	58	+ double dSample, dMixBufferL, dMixBufferR;
59	59	int32_t pos;
60	60	uint32_t i, samplesToMix, samplesLeft;
61	61	uint64_t posFrac;
@@ -97,7 +97,7 @@ void centerMix8bLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
97	97	void centerMix8bBidiLoop(voice_t *v, uint32_t numSamples)
98	98	{
99	99	const int8_t base, revBase, *smpPtr;
100		− float fSample, fMixBufferL, fMixBufferR;
	100	+ double dSample, dMixBufferL, dMixBufferR;
101	101	int32_t pos;
102	102	uint32_t i, samplesToMix, samplesLeft;
103	103	uint64_t posFrac, tmpDelta;
@@ -138,10 +138,10 @@ void centerMix8bBidiLoop(voice_t *v, uint32_t numSamples) · 34 unmodified lines
138	138	SET_BACK_MIXER_POS
139	139	}
140	140
141		−void centerMix8bNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	141	+void centerMix8bNoLoopSIntrp(voice_t *v, uint32_t numSamples)
142	142	{
143	143	const int8_t base, smpPtr;
144		− float fSample, fMixBufferL, fMixBufferR;
	144	+ double dSample, dMixBufferL, dMixBufferR;
145	145	int32_t pos;
146	146	uint32_t i, samplesToMix, samplesLeft;
147	147	uint64_t posFrac;
@@ -158,19 +158,19 @@ void centerMix8bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
158	158
159	159	for (i = 0; i < (samplesToMix & 3); i++)
160	160	{
161		− RENDER_8BIT_SMP_MONO_CINTRP
	161	+ RENDER_8BIT_SMP_MONO_SINTRP
162	162	INC_POS
163	163	}
164	164	samplesToMix >>= 2;
165	165	for (i = 0; i < samplesToMix; i++)
166	166	{
167		− RENDER_8BIT_SMP_MONO_CINTRP
	167	+ RENDER_8BIT_SMP_MONO_SINTRP
168	168	INC_POS
169		− RENDER_8BIT_SMP_MONO_CINTRP
	169	+ RENDER_8BIT_SMP_MONO_SINTRP
170	170	INC_POS
171		− RENDER_8BIT_SMP_MONO_CINTRP
	171	+ RENDER_8BIT_SMP_MONO_SINTRP
172	172	INC_POS
173		− RENDER_8BIT_SMP_MONO_CINTRP
	173	+ RENDER_8BIT_SMP_MONO_SINTRP
174	174	INC_POS
175	175	}
176	176
@@ -180,10 +180,10 @@ void centerMix8bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 3 unmodified lines
180	180	SET_BACK_MIXER_POS
181	181	}
182	182
183		−void centerMix8bLoopCIntrp(voice_t *v, uint32_t numSamples)
	183	+void centerMix8bLoopSIntrp(voice_t *v, uint32_t numSamples)
184	184	{
185	185	const int8_t base, smpPtr;
186		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	186	+ double dSample, dMixBufferL, dMixBufferR;
187	187	int32_t pos;
188	188	uint32_t i, samplesToMix, samplesLeft;
189	189	uint64_t posFrac;
@@ -203,19 +203,19 @@ void centerMix8bLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
203	203	{
204	204	for (i = 0; i < (samplesToMix & 3); i++)
205	205	{
206		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	206	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
207	207	INC_POS
208	208	}
209	209	samplesToMix >>= 2;
210	210	for (i = 0; i < samplesToMix; i++)
211	211	{
212		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	212	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
213	213	INC_POS
214		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	214	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
215	215	INC_POS
216		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	216	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
217	217	INC_POS
218		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	218	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
219	219	INC_POS
220	220	}
221	221	}
@@ -223,19 +223,19 @@ void centerMix8bLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
223	223	{
224	224	for (i = 0; i < (samplesToMix & 3); i++)
225	225	{
226		− RENDER_8BIT_SMP_MONO_CINTRP
	226	+ RENDER_8BIT_SMP_MONO_SINTRP
227	227	INC_POS
228	228	}
229	229	samplesToMix >>= 2;
230	230	for (i = 0; i < samplesToMix; i++)
231	231	{
232		− RENDER_8BIT_SMP_MONO_CINTRP
	232	+ RENDER_8BIT_SMP_MONO_SINTRP
233	233	INC_POS
234		− RENDER_8BIT_SMP_MONO_CINTRP
	234	+ RENDER_8BIT_SMP_MONO_SINTRP
235	235	INC_POS
236		− RENDER_8BIT_SMP_MONO_CINTRP
	236	+ RENDER_8BIT_SMP_MONO_SINTRP
237	237	INC_POS
238		− RENDER_8BIT_SMP_MONO_CINTRP
	238	+ RENDER_8BIT_SMP_MONO_SINTRP
239	239	INC_POS
240	240	}
241	241	}
@@ -246,10 +246,10 @@ void centerMix8bLoopCIntrp(voice_t *v, uint32_t numSamples) · 4 unmodified lines
246	246	SET_BACK_MIXER_POS
247	247	}
248	248
249		−void centerMix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	249	+void centerMix8bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
250	250	{
251	251	const int8_t base, revBase, *smpPtr;
252		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	252	+ double dSample, dMixBufferL, dMixBufferR;
253	253	int32_t pos;
254	254	uint32_t i, samplesToMix, samplesLeft;
255	255	uint64_t posFrac, tmpDelta;
@@ -270,19 +270,19 @@ void centerMix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
270	270	{
271	271	for (i = 0; i < (samplesToMix & 3); i++)
272	272	{
273		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	273	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
274	274	INC_POS_BIDI
275	275	}
276	276	samplesToMix >>= 2;
277	277	for (i = 0; i < samplesToMix; i++)
278	278	{
279		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	279	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
280	280	INC_POS_BIDI
281		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	281	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
282	282	INC_POS_BIDI
283		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	283	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
284	284	INC_POS_BIDI
285		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	285	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
286	286	INC_POS_BIDI
287	287	}
288	288	}
@@ -290,19 +290,19 @@ void centerMix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
290	290	{
291	291	for (i = 0; i < (samplesToMix & 3); i++)
292	292	{
293		− RENDER_8BIT_SMP_MONO_CINTRP
	293	+ RENDER_8BIT_SMP_MONO_SINTRP
294	294	INC_POS_BIDI
295	295	}
296	296	samplesToMix >>= 2;
297	297	for (i = 0; i < samplesToMix; i++)
298	298	{
299		− RENDER_8BIT_SMP_MONO_CINTRP
	299	+ RENDER_8BIT_SMP_MONO_SINTRP
300	300	INC_POS_BIDI
301		− RENDER_8BIT_SMP_MONO_CINTRP
	301	+ RENDER_8BIT_SMP_MONO_SINTRP
302	302	INC_POS_BIDI
303		− RENDER_8BIT_SMP_MONO_CINTRP
	303	+ RENDER_8BIT_SMP_MONO_SINTRP
304	304	INC_POS_BIDI
305		− RENDER_8BIT_SMP_MONO_CINTRP
	305	+ RENDER_8BIT_SMP_MONO_SINTRP
306	306	INC_POS_BIDI
307	307	}
308	308	}
@@ -318,7 +318,7 @@ void centerMix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 9 unmodified lines
318	318	void centerMix8bNoLoopLIntrp(voice_t *v, uint32_t numSamples)
319	319	{
320	320	const int8_t base, smpPtr;
321		− float fSample, fMixBufferL, fMixBufferR;
	321	+ double dSample, dMixBufferL, dMixBufferR;
322	322	int32_t pos;
323	323	uint32_t i, samplesToMix, samplesLeft;
324	324	uint64_t posFrac;
@@ -360,7 +360,7 @@ void centerMix8bNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
360	360	void centerMix8bLoopLIntrp(voice_t *v, uint32_t numSamples)
361	361	{
362	362	const int8_t base, smpPtr;
363		− float fSample, fMixBufferL, fMixBufferR;
	363	+ double dSample, dMixBufferL, dMixBufferR;
364	364	int32_t pos;
365	365	uint32_t i, samplesToMix, samplesLeft;
366	366	uint64_t posFrac;
@@ -402,7 +402,7 @@ void centerMix8bLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
402	402	void centerMix8bBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
403	403	{
404	404	const int8_t base, revBase, *smpPtr;
405		− float fSample, fMixBufferL, fMixBufferR;
	405	+ double dSample, dMixBufferL, dMixBufferR;
406	406	int32_t pos;
407	407	uint32_t i, samplesToMix, samplesLeft;
408	408	uint64_t posFrac, tmpDelta;
@@ -446,9 +446,9 @@ void centerMix8bBidiLoopLIntrp(voice_t *v, uint32_t numSamples) · 37 unmodified lines
446	446	void centerMix8bRampNoLoop(voice_t *v, uint32_t numSamples)
447	447	{
448	448	const int8_t base, smpPtr;
449		− float fSample, fMixBufferL, fMixBufferR;
	449	+ double dSample, dMixBufferL, dMixBufferR;
450	450	int32_t pos;
451		− float fVolLDelta, fVolL;
	451	+ double dVolLDelta, dVolL;
452	452	uint32_t i, samplesToMix, samplesLeft;
453	453	uint64_t posFrac;
454	454
@@ -496,9 +496,9 @@ void centerMix8bRampNoLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
496	496	void centerMix8bRampLoop(voice_t *v, uint32_t numSamples)
497	497	{
498	498	const int8_t base, smpPtr;
499		− float fSample, fMixBufferL, fMixBufferR;
	499	+ double dSample, dMixBufferL, dMixBufferR;
500	500	int32_t pos;
501		− float fVolLDelta, fVolL;
	501	+ double dVolLDelta, dVolL;
502	502	uint32_t i, samplesToMix, samplesLeft;
503	503	uint64_t posFrac;
504	504
@@ -546,9 +546,9 @@ void centerMix8bRampLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
546	546	void centerMix8bRampBidiLoop(voice_t *v, uint32_t numSamples)
547	547	{
548	548	const int8_t base, revBase, *smpPtr;
549		− float fSample, fMixBufferL, fMixBufferR;
	549	+ double dSample, dMixBufferL, dMixBufferR;
550	550	int32_t pos;
551		− float fVolLDelta, fVolL;
	551	+ double dVolLDelta, dVolL;
552	552	uint32_t i, samplesToMix, samplesLeft;
553	553	uint64_t posFrac, tmpDelta;
554	554
@@ -595,12 +595,12 @@ void centerMix8bRampBidiLoop(voice_t *v, uint32_t numSamples) · 40 unmodified lines
595	595	SET_BACK_MIXER_POS
596	596	}
597	597
598		−void centerMix8bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	598	+void centerMix8bRampNoLoopSIntrp(voice_t *v, uint32_t numSamples)
599	599	{
600	600	const int8_t base, smpPtr;
601		− float fSample, fMixBufferL, fMixBufferR;
	601	+ double dSample, dMixBufferL, dMixBufferR;
602	602	int32_t pos;
603		− float fVolLDelta, fVolL;
	603	+ double dVolLDelta, dVolL;
604	604	uint32_t i, samplesToMix, samplesLeft;
605	605	uint64_t posFrac;
606	606
@@ -617,23 +617,23 @@ void centerMix8bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
617	617
618	618	for (i = 0; i < (samplesToMix & 3); i++)
619	619	{
620		− RENDER_8BIT_SMP_MONO_CINTRP
	620	+ RENDER_8BIT_SMP_MONO_SINTRP
621	621	VOLUME_RAMPING_MONO
622	622	INC_POS
623	623	}
624	624	samplesToMix >>= 2;
625	625	for (i = 0; i < samplesToMix; i++)
626	626	{
627		− RENDER_8BIT_SMP_MONO_CINTRP
	627	+ RENDER_8BIT_SMP_MONO_SINTRP
628	628	VOLUME_RAMPING_MONO
629	629	INC_POS
630		− RENDER_8BIT_SMP_MONO_CINTRP
	630	+ RENDER_8BIT_SMP_MONO_SINTRP
631	631	VOLUME_RAMPING_MONO
632	632	INC_POS
633		− RENDER_8BIT_SMP_MONO_CINTRP
	633	+ RENDER_8BIT_SMP_MONO_SINTRP
634	634	VOLUME_RAMPING_MONO
635	635	INC_POS
636		− RENDER_8BIT_SMP_MONO_CINTRP
	636	+ RENDER_8BIT_SMP_MONO_SINTRP
637	637	VOLUME_RAMPING_MONO
638	638	INC_POS
639	639	}
@@ -645,12 +645,12 @@ void centerMix8bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 5 unmodified lines
645	645	SET_BACK_MIXER_POS
646	646	}
647	647
648		−void centerMix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples)
	648	+void centerMix8bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
649	649	{
650	650	const int8_t base, smpPtr;
651		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	651	+ double dSample, dMixBufferL, dMixBufferR;
652	652	int32_t pos;
653		− float fVolLDelta, fVolL;
	653	+ double dVolLDelta, dVolL;
654	654	uint32_t i, samplesToMix, samplesLeft;
655	655	uint64_t posFrac;
656	656
@@ -670,23 +670,23 @@ void centerMix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
670	670	{
671	671	for (i = 0; i < (samplesToMix & 3); i++)
672	672	{
673		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	673	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
674	674	VOLUME_RAMPING_MONO
675	675	INC_POS
676	676	}
677	677	samplesToMix >>= 2;
678	678	for (i = 0; i < samplesToMix; i++)
679	679	{
680		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	680	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
681	681	VOLUME_RAMPING_MONO
682	682	INC_POS
683		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	683	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
684	684	VOLUME_RAMPING_MONO
685	685	INC_POS
686		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	686	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
687	687	VOLUME_RAMPING_MONO
688	688	INC_POS
689		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	689	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
690	690	VOLUME_RAMPING_MONO
691	691	INC_POS
692	692	}
@@ -695,23 +695,23 @@ void centerMix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
695	695	{
696	696	for (i = 0; i < (samplesToMix & 3); i++)
697	697	{
698		− RENDER_8BIT_SMP_MONO_CINTRP
	698	+ RENDER_8BIT_SMP_MONO_SINTRP
699	699	VOLUME_RAMPING_MONO
700	700	INC_POS
701	701	}
702	702	samplesToMix >>= 2;
703	703	for (i = 0; i < samplesToMix; i++)
704	704	{
705		− RENDER_8BIT_SMP_MONO_CINTRP
	705	+ RENDER_8BIT_SMP_MONO_SINTRP
706	706	VOLUME_RAMPING_MONO
707	707	INC_POS
708		− RENDER_8BIT_SMP_MONO_CINTRP
	708	+ RENDER_8BIT_SMP_MONO_SINTRP
709	709	VOLUME_RAMPING_MONO
710	710	INC_POS
711		− RENDER_8BIT_SMP_MONO_CINTRP
	711	+ RENDER_8BIT_SMP_MONO_SINTRP
712	712	VOLUME_RAMPING_MONO
713	713	INC_POS
714		− RENDER_8BIT_SMP_MONO_CINTRP
	714	+ RENDER_8BIT_SMP_MONO_SINTRP
715	715	VOLUME_RAMPING_MONO
716	716	INC_POS
717	717	}
@@ -724,12 +724,12 @@ void centerMix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 6 unmodified lines
724	724	SET_BACK_MIXER_POS
725	725	}
726	726
727		−void centerMix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	727	+void centerMix8bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
728	728	{
729	729	const int8_t base, revBase, *smpPtr;
730		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	730	+ double dSample, dMixBufferL, dMixBufferR;
731	731	int32_t pos;
732		− float fVolLDelta, fVolL;
	732	+ double dVolLDelta, dVolL;
733	733	uint32_t i, samplesToMix, samplesLeft;
734	734	uint64_t posFrac, tmpDelta;
735	735
@@ -750,23 +750,23 @@ void centerMix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
750	750	{
751	751	for (i = 0; i < (samplesToMix & 3); i++)
752	752	{
753		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	753	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
754	754	VOLUME_RAMPING_MONO
755	755	INC_POS_BIDI
756	756	}
757	757	samplesToMix >>= 2;
758	758	for (i = 0; i < samplesToMix; i++)
759	759	{
760		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	760	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
761	761	VOLUME_RAMPING_MONO
762	762	INC_POS_BIDI
763		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	763	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
764	764	VOLUME_RAMPING_MONO
765	765	INC_POS_BIDI
766		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	766	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
767	767	VOLUME_RAMPING_MONO
768	768	INC_POS_BIDI
769		− RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX
	769	+ RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX
770	770	VOLUME_RAMPING_MONO
771	771	INC_POS_BIDI
772	772	}
@@ -775,23 +775,23 @@ void centerMix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
775	775	{
776	776	for (i = 0; i < (samplesToMix & 3); i++)
777	777	{
778		− RENDER_8BIT_SMP_MONO_CINTRP
	778	+ RENDER_8BIT_SMP_MONO_SINTRP
779	779	VOLUME_RAMPING_MONO
780	780	INC_POS_BIDI
781	781	}
782	782	samplesToMix >>= 2;
783	783	for (i = 0; i < samplesToMix; i++)
784	784	{
785		− RENDER_8BIT_SMP_MONO_CINTRP
	785	+ RENDER_8BIT_SMP_MONO_SINTRP
786	786	VOLUME_RAMPING_MONO
787	787	INC_POS_BIDI
788		− RENDER_8BIT_SMP_MONO_CINTRP
	788	+ RENDER_8BIT_SMP_MONO_SINTRP
789	789	VOLUME_RAMPING_MONO
790	790	INC_POS_BIDI
791		− RENDER_8BIT_SMP_MONO_CINTRP
	791	+ RENDER_8BIT_SMP_MONO_SINTRP
792	792	VOLUME_RAMPING_MONO
793	793	INC_POS_BIDI
794		− RENDER_8BIT_SMP_MONO_CINTRP
	794	+ RENDER_8BIT_SMP_MONO_SINTRP
795	795	VOLUME_RAMPING_MONO
796	796	INC_POS_BIDI
797	797	}
@@ -808,9 +808,9 @@ void centerMix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
808	808	void centerMix8bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples)
809	809	{
810	810	const int8_t base, smpPtr;
811		− float fSample, fMixBufferL, fMixBufferR;
	811	+ double dSample, dMixBufferL, dMixBufferR;
812	812	int32_t pos;
813		− float fVolLDelta, fVolL;
	813	+ double dVolLDelta, dVolL;
814	814	uint32_t i, samplesToMix, samplesLeft;
815	815	uint64_t posFrac;
816	816
@@ -858,9 +858,9 @@ void centerMix8bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
858	858	void centerMix8bRampLoopLIntrp(voice_t *v, uint32_t numSamples)
859	859	{
860	860	const int8_t base, smpPtr;
861		− float fSample, fMixBufferL, fMixBufferR;
	861	+ double dSample, dMixBufferL, dMixBufferR;
862	862	int32_t pos;
863		− float fVolLDelta, fVolL;
	863	+ double dVolLDelta, dVolL;
864	864	uint32_t i, samplesToMix, samplesLeft;
865	865	uint64_t posFrac;
866	866
@@ -908,9 +908,9 @@ void centerMix8bRampLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
908	908	void centerMix8bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
909	909	{
910	910	const int8_t base, revBase, *smpPtr;
911		− float fSample, fMixBufferL, fMixBufferR;
	911	+ double dSample, dMixBufferL, dMixBufferR;
912	912	int32_t pos;
913		− float fVolLDelta, fVolL;
	913	+ double dVolLDelta, dVolL;
914	914	uint32_t i, samplesToMix, samplesLeft;
915	915	uint64_t posFrac, tmpDelta;
916	916
@@ -964,7 +964,7 @@ void centerMix8bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples) · 47 unmodified lines
964	964	void centerMix16bNoLoop(voice_t *v, uint32_t numSamples)
965	965	{
966	966	const int16_t base, smpPtr;
967		− float fSample, fMixBufferL, fMixBufferR;
	967	+ double dSample, dMixBufferL, dMixBufferR;
968	968	int32_t pos;
969	969	uint32_t i, samplesToMix, samplesLeft;
970	970	uint64_t posFrac;
@@ -1006,7 +1006,7 @@ void centerMix16bNoLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1006	1006	void centerMix16bLoop(voice_t *v, uint32_t numSamples)
1007	1007	{
1008	1008	const int16_t base, smpPtr;
1009		− float fSample, fMixBufferL, fMixBufferR;
	1009	+ double dSample, dMixBufferL, dMixBufferR;
1010	1010	int32_t pos;
1011	1011	uint32_t i, samplesToMix, samplesLeft;
1012	1012	uint64_t posFrac;
@@ -1048,7 +1048,7 @@ void centerMix16bLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1048	1048	void centerMix16bBidiLoop(voice_t *v, uint32_t numSamples)
1049	1049	{
1050	1050	const int16_t base, revBase, *smpPtr;
1051		− float fSample, fMixBufferL, fMixBufferR;
	1051	+ double dSample, dMixBufferL, dMixBufferR;
1052	1052	int32_t pos;
1053	1053	uint32_t i, samplesToMix, samplesLeft;
1054	1054	uint64_t posFrac, tmpDelta;
@@ -1089,10 +1089,10 @@ void centerMix16bBidiLoop(voice_t *v, uint32_t numSamples) · 34 unmodified lines
1089	1089	SET_BACK_MIXER_POS
1090	1090	}
1091	1091
1092		−void centerMix16bNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	1092	+void centerMix16bNoLoopSIntrp(voice_t *v, uint32_t numSamples)
1093	1093	{
1094	1094	const int16_t base, smpPtr;
1095		− float fSample, fMixBufferL, fMixBufferR;
	1095	+ double dSample, dMixBufferL, dMixBufferR;
1096	1096	int32_t pos;
1097	1097	uint32_t i, samplesToMix, samplesLeft;
1098	1098	uint64_t posFrac;
@@ -1109,19 +1109,19 @@ void centerMix16bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
1109	1109
1110	1110	for (i = 0; i < (samplesToMix & 3); i++)
1111	1111	{
1112		− RENDER_16BIT_SMP_MONO_CINTRP
	1112	+ RENDER_16BIT_SMP_MONO_SINTRP
1113	1113	INC_POS
1114	1114	}
1115	1115	samplesToMix >>= 2;
1116	1116	for (i = 0; i < samplesToMix; i++)
1117	1117	{
1118		− RENDER_16BIT_SMP_MONO_CINTRP
	1118	+ RENDER_16BIT_SMP_MONO_SINTRP
1119	1119	INC_POS
1120		− RENDER_16BIT_SMP_MONO_CINTRP
	1120	+ RENDER_16BIT_SMP_MONO_SINTRP
1121	1121	INC_POS
1122		− RENDER_16BIT_SMP_MONO_CINTRP
	1122	+ RENDER_16BIT_SMP_MONO_SINTRP
1123	1123	INC_POS
1124		− RENDER_16BIT_SMP_MONO_CINTRP
	1124	+ RENDER_16BIT_SMP_MONO_SINTRP
1125	1125	INC_POS
1126	1126	}
1127	1127
@@ -1131,10 +1131,10 @@ void centerMix16bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 3 unmodified lines
1131	1131	SET_BACK_MIXER_POS
1132	1132	}
1133	1133
1134		−void centerMix16bLoopCIntrp(voice_t *v, uint32_t numSamples)
	1134	+void centerMix16bLoopSIntrp(voice_t *v, uint32_t numSamples)
1135	1135	{
1136	1136	const int16_t base, smpPtr;
1137		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1137	+ double dSample, dMixBufferL, dMixBufferR;
1138	1138	int32_t pos;
1139	1139	uint32_t i, samplesToMix, samplesLeft;
1140	1140	uint64_t posFrac;
@@ -1154,19 +1154,19 @@ void centerMix16bLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
1154	1154	{
1155	1155	for (i = 0; i < (samplesToMix & 3); i++)
1156	1156	{
1157		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1157	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1158	1158	INC_POS
1159	1159	}
1160	1160	samplesToMix >>= 2;
1161	1161	for (i = 0; i < samplesToMix; i++)
1162	1162	{
1163		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1163	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1164	1164	INC_POS
1165		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1165	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1166	1166	INC_POS
1167		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1167	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1168	1168	INC_POS
1169		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1169	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1170	1170	INC_POS
1171	1171	}
1172	1172	}
@@ -1174,19 +1174,19 @@ void centerMix16bLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
1174	1174	{
1175	1175	for (i = 0; i < (samplesToMix & 3); i++)
1176	1176	{
1177		− RENDER_16BIT_SMP_MONO_CINTRP
	1177	+ RENDER_16BIT_SMP_MONO_SINTRP
1178	1178	INC_POS
1179	1179	}
1180	1180	samplesToMix >>= 2;
1181	1181	for (i = 0; i < samplesToMix; i++)
1182	1182	{
1183		− RENDER_16BIT_SMP_MONO_CINTRP
	1183	+ RENDER_16BIT_SMP_MONO_SINTRP
1184	1184	INC_POS
1185		− RENDER_16BIT_SMP_MONO_CINTRP
	1185	+ RENDER_16BIT_SMP_MONO_SINTRP
1186	1186	INC_POS
1187		− RENDER_16BIT_SMP_MONO_CINTRP
	1187	+ RENDER_16BIT_SMP_MONO_SINTRP
1188	1188	INC_POS
1189		− RENDER_16BIT_SMP_MONO_CINTRP
	1189	+ RENDER_16BIT_SMP_MONO_SINTRP
1190	1190	INC_POS
1191	1191	}
1192	1192	}
@@ -1197,10 +1197,10 @@ void centerMix16bLoopCIntrp(voice_t *v, uint32_t numSamples) · 4 unmodified lines
1197	1197	SET_BACK_MIXER_POS
1198	1198	}
1199	1199
1200		−void centerMix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	1200	+void centerMix16bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
1201	1201	{
1202	1202	const int16_t base, revBase, *smpPtr;
1203		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1203	+ double dSample, dMixBufferL, dMixBufferR;
1204	1204	int32_t pos;
1205	1205	uint32_t i, samplesToMix, samplesLeft;
1206	1206	uint64_t posFrac, tmpDelta;
@@ -1221,19 +1221,19 @@ void centerMix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
1221	1221	{
1222	1222	for (i = 0; i < (samplesToMix & 3); i++)
1223	1223	{
1224		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1224	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1225	1225	INC_POS_BIDI
1226	1226	}
1227	1227	samplesToMix >>= 2;
1228	1228	for (i = 0; i < samplesToMix; i++)
1229	1229	{
1230		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1230	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1231	1231	INC_POS_BIDI
1232		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1232	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1233	1233	INC_POS_BIDI
1234		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1234	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1235	1235	INC_POS_BIDI
1236		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1236	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1237	1237	INC_POS_BIDI
1238	1238	}
1239	1239	}
@@ -1241,19 +1241,19 @@ void centerMix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
1241	1241	{
1242	1242	for (i = 0; i < (samplesToMix & 3); i++)
1243	1243	{
1244		− RENDER_16BIT_SMP_MONO_CINTRP
	1244	+ RENDER_16BIT_SMP_MONO_SINTRP
1245	1245	INC_POS_BIDI
1246	1246	}
1247	1247	samplesToMix >>= 2;
1248	1248	for (i = 0; i < samplesToMix; i++)
1249	1249	{
1250		− RENDER_16BIT_SMP_MONO_CINTRP
	1250	+ RENDER_16BIT_SMP_MONO_SINTRP
1251	1251	INC_POS_BIDI
1252		− RENDER_16BIT_SMP_MONO_CINTRP
	1252	+ RENDER_16BIT_SMP_MONO_SINTRP
1253	1253	INC_POS_BIDI
1254		− RENDER_16BIT_SMP_MONO_CINTRP
	1254	+ RENDER_16BIT_SMP_MONO_SINTRP
1255	1255	INC_POS_BIDI
1256		− RENDER_16BIT_SMP_MONO_CINTRP
	1256	+ RENDER_16BIT_SMP_MONO_SINTRP
1257	1257	INC_POS_BIDI
1258	1258	}
1259	1259	}
@@ -1268,7 +1268,7 @@ void centerMix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 8 unmodified lines
1268	1268	void centerMix16bNoLoopLIntrp(voice_t *v, uint32_t numSamples)
1269	1269	{
1270	1270	const int16_t base, smpPtr;
1271		− float fSample, fMixBufferL, fMixBufferR;
	1271	+ double dSample, dMixBufferL, dMixBufferR;
1272	1272	int32_t pos;
1273	1273	uint32_t i, samplesToMix, samplesLeft;
1274	1274	uint64_t posFrac;
@@ -1310,7 +1310,7 @@ void centerMix16bNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1310	1310	void centerMix16bLoopLIntrp(voice_t *v, uint32_t numSamples)
1311	1311	{
1312	1312	const int16_t base, smpPtr;
1313		− float fSample, fMixBufferL, fMixBufferR;
	1313	+ double dSample, dMixBufferL, dMixBufferR;
1314	1314	int32_t pos;
1315	1315	uint32_t i, samplesToMix, samplesLeft;
1316	1316	uint64_t posFrac;
@@ -1352,7 +1352,7 @@ void centerMix16bLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1352	1352	void centerMix16bBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
1353	1353	{
1354	1354	const int16_t base, revBase, *smpPtr;
1355		− float fSample, fMixBufferL, fMixBufferR;
	1355	+ double dSample, dMixBufferL, dMixBufferR;
1356	1356	int32_t pos;
1357	1357	uint32_t i, samplesToMix, samplesLeft;
1358	1358	uint64_t posFrac, tmpDelta;
@@ -1397,9 +1397,9 @@ void centerMix16bBidiLoopLIntrp(voice_t *v, uint32_t numSamples) · 38 unmodified lines
1397	1397	void centerMix16bRampNoLoop(voice_t *v, uint32_t numSamples)
1398	1398	{
1399	1399	const int16_t base, smpPtr;
1400		− float fSample, fMixBufferL, fMixBufferR;
	1400	+ double dSample, dMixBufferL, dMixBufferR;
1401	1401	int32_t pos;
1402		− float fVolLDelta, fVolL;
	1402	+ double dVolLDelta, dVolL;
1403	1403	uint32_t i, samplesToMix, samplesLeft;
1404	1404	uint64_t posFrac;
1405	1405
@@ -1447,9 +1447,9 @@ void centerMix16bRampNoLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1447	1447	void centerMix16bRampLoop(voice_t *v, uint32_t numSamples)
1448	1448	{
1449	1449	const int16_t base, smpPtr;
1450		− float fSample, fMixBufferL, fMixBufferR;
	1450	+ double dSample, dMixBufferL, dMixBufferR;
1451	1451	int32_t pos;
1452		− float fVolLDelta, fVolL;
	1452	+ double dVolLDelta, dVolL;
1453	1453	uint32_t i, samplesToMix, samplesLeft;
1454	1454	uint64_t posFrac;
1455	1455
@@ -1497,9 +1497,9 @@ void centerMix16bRampLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1497	1497	void centerMix16bRampBidiLoop(voice_t *v, uint32_t numSamples)
1498	1498	{
1499	1499	const int16_t base, revBase, *smpPtr;
1500		− float fSample, fMixBufferL, fMixBufferR;
	1500	+ double dSample, dMixBufferL, dMixBufferR;
1501	1501	int32_t pos;
1502		− float fVolLDelta, fVolL;
	1502	+ double dVolLDelta, dVolL;
1503	1503	uint32_t i, samplesToMix, samplesLeft;
1504	1504	uint64_t posFrac, tmpDelta;
1505	1505
@@ -1546,12 +1546,12 @@ void centerMix16bRampBidiLoop(voice_t *v, uint32_t numSamples) · 40 unmodified lines
1546	1546	SET_BACK_MIXER_POS
1547	1547	}
1548	1548
1549		−void centerMix16bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	1549	+void centerMix16bRampNoLoopSIntrp(voice_t *v, uint32_t numSamples)
1550	1550	{
1551	1551	const int16_t base, smpPtr;
1552		− float fSample, fMixBufferL, fMixBufferR;
	1552	+ double dSample, dMixBufferL, dMixBufferR;
1553	1553	int32_t pos;
1554		− float fVolLDelta, fVolL;
	1554	+ double dVolLDelta, dVolL;
1555	1555	uint32_t i, samplesToMix, samplesLeft;
1556	1556	uint64_t posFrac;
1557	1557
@@ -1568,23 +1568,23 @@ void centerMix16bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
1568	1568
1569	1569	for (i = 0; i < (samplesToMix & 3); i++)
1570	1570	{
1571		− RENDER_16BIT_SMP_MONO_CINTRP
	1571	+ RENDER_16BIT_SMP_MONO_SINTRP
1572	1572	VOLUME_RAMPING_MONO
1573	1573	INC_POS
1574	1574	}
1575	1575	samplesToMix >>= 2;
1576	1576	for (i = 0; i < samplesToMix; i++)
1577	1577	{
1578		− RENDER_16BIT_SMP_MONO_CINTRP
	1578	+ RENDER_16BIT_SMP_MONO_SINTRP
1579	1579	VOLUME_RAMPING_MONO
1580	1580	INC_POS
1581		− RENDER_16BIT_SMP_MONO_CINTRP
	1581	+ RENDER_16BIT_SMP_MONO_SINTRP
1582	1582	VOLUME_RAMPING_MONO
1583	1583	INC_POS
1584		− RENDER_16BIT_SMP_MONO_CINTRP
	1584	+ RENDER_16BIT_SMP_MONO_SINTRP
1585	1585	VOLUME_RAMPING_MONO
1586	1586	INC_POS
1587		− RENDER_16BIT_SMP_MONO_CINTRP
	1587	+ RENDER_16BIT_SMP_MONO_SINTRP
1588	1588	VOLUME_RAMPING_MONO
1589	1589	INC_POS
1590	1590	}
@@ -1596,12 +1596,12 @@ void centerMix16bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 5 unmodified lines
1596	1596	SET_BACK_MIXER_POS
1597	1597	}
1598	1598
1599		−void centerMix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples)
	1599	+void centerMix16bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
1600	1600	{
1601	1601	const int16_t base, smpPtr;
1602		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1602	+ double dSample, dMixBufferL, dMixBufferR;
1603	1603	int32_t pos;
1604		− float fVolLDelta, fVolL;
	1604	+ double dVolLDelta, dVolL;
1605	1605	uint32_t i, samplesToMix, samplesLeft;
1606	1606	uint64_t posFrac;
1607	1607
@@ -1621,23 +1621,23 @@ void centerMix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
1621	1621	{
1622	1622	for (i = 0; i < (samplesToMix & 3); i++)
1623	1623	{
1624		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1624	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1625	1625	VOLUME_RAMPING_MONO
1626	1626	INC_POS
1627	1627	}
1628	1628	samplesToMix >>= 2;
1629	1629	for (i = 0; i < samplesToMix; i++)
1630	1630	{
1631		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1631	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1632	1632	VOLUME_RAMPING_MONO
1633	1633	INC_POS
1634		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1634	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1635	1635	VOLUME_RAMPING_MONO
1636	1636	INC_POS
1637		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1637	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1638	1638	VOLUME_RAMPING_MONO
1639	1639	INC_POS
1640		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1640	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1641	1641	VOLUME_RAMPING_MONO
1642	1642	INC_POS
1643	1643	}
@@ -1646,23 +1646,23 @@ void centerMix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
1646	1646	{
1647	1647	for (i = 0; i < (samplesToMix & 3); i++)
1648	1648	{
1649		− RENDER_16BIT_SMP_MONO_CINTRP
	1649	+ RENDER_16BIT_SMP_MONO_SINTRP
1650	1650	VOLUME_RAMPING_MONO
1651	1651	INC_POS
1652	1652	}
1653	1653	samplesToMix >>= 2;
1654	1654	for (i = 0; i < samplesToMix; i++)
1655	1655	{
1656		− RENDER_16BIT_SMP_MONO_CINTRP
	1656	+ RENDER_16BIT_SMP_MONO_SINTRP
1657	1657	VOLUME_RAMPING_MONO
1658	1658	INC_POS
1659		− RENDER_16BIT_SMP_MONO_CINTRP
	1659	+ RENDER_16BIT_SMP_MONO_SINTRP
1660	1660	VOLUME_RAMPING_MONO
1661	1661	INC_POS
1662		− RENDER_16BIT_SMP_MONO_CINTRP
	1662	+ RENDER_16BIT_SMP_MONO_SINTRP
1663	1663	VOLUME_RAMPING_MONO
1664	1664	INC_POS
1665		− RENDER_16BIT_SMP_MONO_CINTRP
	1665	+ RENDER_16BIT_SMP_MONO_SINTRP
1666	1666	VOLUME_RAMPING_MONO
1667	1667	INC_POS
1668	1668	}
@@ -1675,12 +1675,12 @@ void centerMix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 6 unmodified lines
1675	1675	SET_BACK_MIXER_POS
1676	1676	}
1677	1677
1678		−void centerMix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	1678	+void centerMix16bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
1679	1679	{
1680	1680	const int16_t base, revBase, *smpPtr;
1681		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1681	+ double dSample, dMixBufferL, dMixBufferR;
1682	1682	int32_t pos;
1683		− float fVolLDelta, fVolL;
	1683	+ double dVolLDelta, dVolL;
1684	1684	uint32_t i, samplesToMix, samplesLeft;
1685	1685	uint64_t posFrac, tmpDelta;
1686	1686
@@ -1701,23 +1701,23 @@ void centerMix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
1701	1701	{
1702	1702	for (i = 0; i < (samplesToMix & 3); i++)
1703	1703	{
1704		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1704	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1705	1705	VOLUME_RAMPING_MONO
1706	1706	INC_POS_BIDI
1707	1707	}
1708	1708	samplesToMix >>= 2;
1709	1709	for (i = 0; i < samplesToMix; i++)
1710	1710	{
1711		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1711	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1712	1712	VOLUME_RAMPING_MONO
1713	1713	INC_POS_BIDI
1714		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1714	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1715	1715	VOLUME_RAMPING_MONO
1716	1716	INC_POS_BIDI
1717		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1717	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1718	1718	VOLUME_RAMPING_MONO
1719	1719	INC_POS_BIDI
1720		− RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX
	1720	+ RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX
1721	1721	VOLUME_RAMPING_MONO
1722	1722	INC_POS_BIDI
1723	1723	}
@@ -1726,23 +1726,23 @@ void centerMix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
1726	1726	{
1727	1727	for (i = 0; i < (samplesToMix & 3); i++)
1728	1728	{
1729		− RENDER_16BIT_SMP_MONO_CINTRP
	1729	+ RENDER_16BIT_SMP_MONO_SINTRP
1730	1730	VOLUME_RAMPING_MONO
1731	1731	INC_POS_BIDI
1732	1732	}
1733	1733	samplesToMix >>= 2;
1734	1734	for (i = 0; i < samplesToMix; i++)
1735	1735	{
1736		− RENDER_16BIT_SMP_MONO_CINTRP
	1736	+ RENDER_16BIT_SMP_MONO_SINTRP
1737	1737	VOLUME_RAMPING_MONO
1738	1738	INC_POS_BIDI
1739		− RENDER_16BIT_SMP_MONO_CINTRP
	1739	+ RENDER_16BIT_SMP_MONO_SINTRP
1740	1740	VOLUME_RAMPING_MONO
1741	1741	INC_POS_BIDI
1742		− RENDER_16BIT_SMP_MONO_CINTRP
	1742	+ RENDER_16BIT_SMP_MONO_SINTRP
1743	1743	VOLUME_RAMPING_MONO
1744	1744	INC_POS_BIDI
1745		− RENDER_16BIT_SMP_MONO_CINTRP
	1745	+ RENDER_16BIT_SMP_MONO_SINTRP
1746	1746	VOLUME_RAMPING_MONO
1747	1747	INC_POS_BIDI
1748	1748	}
@@ -1759,9 +1759,9 @@ void centerMix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
1759	1759	void centerMix16bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples)
1760	1760	{
1761	1761	const int16_t base, smpPtr;
1762		− float fSample, fMixBufferL, fMixBufferR;
	1762	+ double dSample, dMixBufferL, dMixBufferR;
1763	1763	int32_t pos;
1764		− float fVolLDelta, fVolL;
	1764	+ double dVolLDelta, dVolL;
1765	1765	uint32_t i, samplesToMix, samplesLeft;
1766	1766	uint64_t posFrac;
1767	1767
@@ -1809,9 +1809,9 @@ void centerMix16bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1809	1809	void centerMix16bRampLoopLIntrp(voice_t *v, uint32_t numSamples)
1810	1810	{
1811	1811	const int16_t base, smpPtr;
1812		− float fSample, fMixBufferL, fMixBufferR;
	1812	+ double dSample, dMixBufferL, dMixBufferR;
1813	1813	int32_t pos;
1814		− float fVolLDelta, fVolL;
	1814	+ double dVolLDelta, dVolL;
1815	1815	uint32_t i, samplesToMix, samplesLeft;
1816	1816	uint64_t posFrac;
1817	1817
@@ -1859,9 +1859,9 @@ void centerMix16bRampLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1859	1859	void centerMix16bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
1860	1860	{
1861	1861	const int16_t base, revBase, *smpPtr;
1862		− float fSample, fMixBufferL, fMixBufferR;
	1862	+ double dSample, dMixBufferL, dMixBufferR;
1863	1863	int32_t pos;
1864		− float fVolLDelta, fVolL;
	1864	+ double dVolLDelta, dVolL;
1865	1865	uint32_t i, samplesToMix, samplesLeft;
1866	1866	uint64_t posFrac, tmpDelta;
1867	1867

src/mixer/ft2_center_mix.h+12−12

@@ -9,9 +9,9 @@ · 8 unmodified lines
9	9	void centerMix8bNoLoop(voice_t *v, uint32_t numSamples);
10	10	void centerMix8bLoop(voice_t *v, uint32_t numSamples);
11	11	void centerMix8bBidiLoop(voice_t *v, uint32_t numSamples);
12		−void centerMix8bNoLoopCIntrp(voice_t *v, uint32_t numSamples);
13		−void centerMix8bLoopCIntrp(voice_t *v, uint32_t numSamples);
14		−void centerMix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples);
	12	+void centerMix8bNoLoopSIntrp(voice_t *v, uint32_t numSamples);
	13	+void centerMix8bLoopSIntrp(voice_t *v, uint32_t numSamples);
	14	+void centerMix8bBidiLoopSIntrp(voice_t *v, uint32_t numSamples);
15	15	void centerMix8bNoLoopLIntrp(voice_t *v, uint32_t numSamples);
16	16	void centerMix8bLoopLIntrp(voice_t *v, uint32_t numSamples);
17	17	void centerMix8bBidiLoopLIntrp(voice_t *v, uint32_t numSamples);
@@ -20,9 +20,9 @@ void centerMix8bBidiLoopLIntrp(voice_t *v, uint32_t numSamples); · 2 unmodified lines
20	20	void centerMix16bNoLoop(voice_t *v, uint32_t numSamples);
21	21	void centerMix16bLoop(voice_t *v, uint32_t numSamples);
22	22	void centerMix16bBidiLoop(voice_t *v, uint32_t numSamples);
23		−void centerMix16bNoLoopCIntrp(voice_t *v, uint32_t numSamples);
24		−void centerMix16bLoopCIntrp(voice_t *v, uint32_t numSamples);
25		−void centerMix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples);
	23	+void centerMix16bNoLoopSIntrp(voice_t *v, uint32_t numSamples);
	24	+void centerMix16bLoopSIntrp(voice_t *v, uint32_t numSamples);
	25	+void centerMix16bBidiLoopSIntrp(voice_t *v, uint32_t numSamples);
26	26	void centerMix16bNoLoopLIntrp(voice_t *v, uint32_t numSamples);
27	27	void centerMix16bLoopLIntrp(voice_t *v, uint32_t numSamples);
28	28	void centerMix16bBidiLoopLIntrp(voice_t *v, uint32_t numSamples);
@@ -33,9 +33,9 @@ void centerMix16bBidiLoopLIntrp(voice_t *v, uint32_t numSamples); · 4 unmodified lines
33	33	void centerMix8bRampNoLoop(voice_t *v, uint32_t numSamples);
34	34	void centerMix8bRampLoop(voice_t *v, uint32_t numSamples);
35	35	void centerMix8bRampBidiLoop(voice_t *v, uint32_t numSamples);
36		−void centerMix8bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples);
37		−void centerMix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples);
38		−void centerMix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples);
	36	+void centerMix8bRampNoLoopSIntrp(voice_t *v, uint32_t numSamples);
	37	+void centerMix8bRampLoopSIntrp(voice_t *v, uint32_t numSamples);
	38	+void centerMix8bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples);
39	39	void centerMix8bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples);
40	40	void centerMix8bRampLoopLIntrp(voice_t *v, uint32_t numSamples);
41	41	void centerMix8bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples);
@@ -44,9 +44,9 @@ void centerMix8bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples); · 2 unmodified lines
44	44	void centerMix16bRampNoLoop(voice_t *v, uint32_t numSamples);
45	45	void centerMix16bRampLoop(voice_t *v, uint32_t numSamples);
46	46	void centerMix16bRampBidiLoop(voice_t *v, uint32_t numSamples);
47		−void centerMix16bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples);
48		−void centerMix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples);
49		−void centerMix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples);
	47	+void centerMix16bRampNoLoopSIntrp(voice_t *v, uint32_t numSamples);
	48	+void centerMix16bRampLoopSIntrp(voice_t *v, uint32_t numSamples);
	49	+void centerMix16bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples);
50	50	void centerMix16bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples);
51	51	void centerMix16bRampLoopLIntrp(voice_t *v, uint32_t numSamples);
52	52	void centerMix16bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples);

src/mixer/ft2_cubicspline.c+0−59

@@ -1,59 +0,0 @@
1		−#include <stdint.h>
2		−#include <stdbool.h>
3		−#include <stdlib.h>
4		−#include "ft2_cubicspline.h"
5		−
6		−float *fCubicSplineLUT8 = NULL;
7		−float *fCubicSplineLUT16 = NULL;
8		−
9		−/* 4-tap cubic spline interpolation (Horner's method)
10		−**
11		−** This simplified LUT formula has been used in several trackers, but
12		−** I think it originates from ModPlug Tracker (not sure about this).
13		−*/
14		−
15		−static void calcCubicLUT(float *fLUTPtr, const double dSale)
16		−{
17		− for (int32_t i = 0; i < CUBIC_PHASES; i++)
18		− {
19		− const double x = i * (1.0 / CUBIC_PHASES);
20		− const double x2 = x * x; // x^2
21		− const double x3 = x2 * x; // x^3
22		−
23		− fLUTPtr++ = (float)((-0.5 x3 + 1.0 * x2 - 0.5 * x) * dSale);
24		− fLUTPtr++ = (float)(( 1.5 x3 - 2.5 * x2 + 1.0) * dSale);
25		− fLUTPtr++ = (float)((-1.5 x3 + 2.0 * x2 + 0.5 * x) * dSale);
26		− fLUTPtr++ = (float)(( 0.5 x3 - 0.5 * x2) * dSale);
27		− }
28		−}
29		−
30		−bool calcCubicTable(void)
31		−{
32		− fCubicSplineLUT8 = (float )malloc(CUBIC_LUT_LEN sizeof (float));
33		− if (fCubicSplineLUT8 == NULL)
34		− return false;
35		−
36		− fCubicSplineLUT16 = (float )malloc(CUBIC_LUT_LEN sizeof (float));
37		− if (fCubicSplineLUT16 == NULL)
38		− return false;
39		−
40		− calcCubicLUT(fCubicSplineLUT8, 1.0 / 128.0); // for 8-bit samples
41		− calcCubicLUT(fCubicSplineLUT16, 1.0 / 32768.0); // for 16-bit samples
42		−
43		− return true;
44		−}
45		−
46		−void freeCubicTable(void)
47		−{
48		− if (fCubicSplineLUT8 != NULL)
49		− {
50		− free(fCubicSplineLUT8);
51		− fCubicSplineLUT8 = NULL;
52		− }
53		−
54		− if (fCubicSplineLUT16 != NULL)
55		− {
56		− free(fCubicSplineLUT16);
57		− fCubicSplineLUT16 = NULL;
58		− }
59		−}

src/mixer/ft2_cubicspline.h+0−22

@@ -1,22 +0,0 @@
1		−#pragma once
2		−
3		−#include <stdbool.h>
4		−#include "../ft2_audio.h" // MIXER_FRAC_BITS definition
5		−
6		−// if you change this, also change CUBIC_PHASES_BITS
7		−#define CUBIC_PHASES 4096
8		−#define CUBIC_PHASES_BITS 12 /* log2(CUBIC_PHASES) */
9		−
10		−// don't change these!
11		−
12		−#define CUBIC_WIDTH 4
13		−#define CUBIC_WIDTH_BITS 2
14		−#define CUBIC_LUT_LEN (CUBIC_WIDTH * CUBIC_PHASES)
15		−#define CUBIC_FSHIFT (MIXER_FRAC_BITS-(CUBIC_PHASES_BITS+CUBIC_WIDTH_BITS))
16		−#define CUBIC_FMASK ((CUBIC_WIDTH*CUBIC_PHASES)-CUBIC_WIDTH)
17		−
18		−extern float *fCubicSplineLUT8;
19		−extern float *fCubicSplineLUT16;
20		−
21		−bool calcCubicTable(void);
22		−void freeCubicTable(void);

src/mixer/ft2_mix.c+194−194

@@ -5,17 +5,17 @@ · 4 unmodified lines
5	5	#include "ft2_center_mix.h"
6	6
7	7	/*
8		−** -------------------- floating point audio channel mixer ---------------------
	8	+** -------------------- doubleing point audio channel mixer ---------------------
9	9	** (Note: Mixing macros can be found in ft2_mix_macros.h)
10	10	**
11	11	** Specifications:
12		−** - Either no interpolation, 2-tap linear interpolation (FT2) or 4-tap cubic interpolation
	12	+** - Either no interpolation, 2-tap linear interpolation (FT2) or 8-tap windowed-sinc interpolation
13	13	** - Linear volume ramping, matching FT2 (can be turned off)
14	14	** - 32.32 fixed-point logic for resampling delta
15		−** - 32-bit single-precision float logic for mixing and interpolation
	15	+** - 64-bit doube-precision logic for mixing and interpolation
16	16	**
17	17	** This file has separate routines for EVERY possible sampling variation:
18		−** Interpolation none/cubic/linear, volumeramp on/off, 8-bit, 16-bit, no loop, loop, bidi.
	18	+** Interpolation none/sinc/linear, volumeramp on/off, 8-bit, 16-bit, no loop, loop, bidi.
19	19	** (36 mixing routines in total + another 36 for center-mixing)
20	20	**
21	21	** Every voice has a function pointer set to the according mixing routine on
@@ -34,7 +34,7 @@ · 12 unmodified lines
34	34	static void mix8bNoLoop(voice_t *v, uint32_t numSamples)
35	35	{
36	36	const int8_t base, smpPtr;
37		− float fSample, fMixBufferL, fMixBufferR;
	37	+ double dSample, dMixBufferL, dMixBufferR;
38	38	int32_t pos;
39	39	uint32_t i, samplesToMix, samplesLeft;
40	40	uint64_t posFrac;
@@ -76,7 +76,7 @@ static void mix8bNoLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
76	76	static void mix8bLoop(voice_t *v, uint32_t numSamples)
77	77	{
78	78	const int8_t base, smpPtr;
79		− float fSample, fMixBufferL, fMixBufferR;
	79	+ double dSample, dMixBufferL, dMixBufferR;
80	80	int32_t pos;
81	81	uint32_t i, samplesToMix, samplesLeft;
82	82	uint64_t posFrac;
@@ -118,7 +118,7 @@ static void mix8bLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
118	118	static void mix8bBidiLoop(voice_t *v, uint32_t numSamples)
119	119	{
120	120	const int8_t base, revBase, *smpPtr;
121		− float fSample, fMixBufferL, fMixBufferR;
	121	+ double dSample, dMixBufferL, dMixBufferR;
122	122	int32_t pos;
123	123	uint32_t i, samplesToMix, samplesLeft;
124	124	uint64_t posFrac, tmpDelta;
@@ -158,10 +158,10 @@ static void mix8bBidiLoop(voice_t *v, uint32_t numSamples) · 33 unmodified lines
158	158	SET_BACK_MIXER_POS
159	159	}
160	160
161		−static void mix8bNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	161	+static void mix8bNoLoopSIntrp(voice_t *v, uint32_t numSamples)
162	162	{
163	163	const int8_t base, smpPtr;
164		− float fSample, fMixBufferL, fMixBufferR;
	164	+ double dSample, dMixBufferL, dMixBufferR;
165	165	int32_t pos;
166	166	uint32_t i, samplesToMix, samplesLeft;
167	167	uint64_t posFrac;
@@ -178,19 +178,19 @@ static void mix8bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
178	178
179	179	for (i = 0; i < (samplesToMix & 3); i++)
180	180	{
181		− RENDER_8BIT_SMP_CINTRP
	181	+ RENDER_8BIT_SMP_SINTRP
182	182	INC_POS
183	183	}
184	184	samplesToMix >>= 2;
185	185	for (i = 0; i < samplesToMix; i++)
186	186	{
187		− RENDER_8BIT_SMP_CINTRP
	187	+ RENDER_8BIT_SMP_SINTRP
188	188	INC_POS
189		− RENDER_8BIT_SMP_CINTRP
	189	+ RENDER_8BIT_SMP_SINTRP
190	190	INC_POS
191		− RENDER_8BIT_SMP_CINTRP
	191	+ RENDER_8BIT_SMP_SINTRP
192	192	INC_POS
193		− RENDER_8BIT_SMP_CINTRP
	193	+ RENDER_8BIT_SMP_SINTRP
194	194	INC_POS
195	195	}
196	196
@@ -200,10 +200,10 @@ static void mix8bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 3 unmodified lines
200	200	SET_BACK_MIXER_POS
201	201	}
202	202
203		−static void mix8bLoopCIntrp(voice_t *v, uint32_t numSamples)
	203	+static void mix8bLoopSIntrp(voice_t *v, uint32_t numSamples)
204	204	{
205	205	const int8_t base, smpPtr;
206		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	206	+ double dSample, dMixBufferL, dMixBufferR;
207	207	int32_t pos;
208	208	uint32_t i, samplesToMix, samplesLeft;
209	209	uint64_t posFrac;
@@ -223,19 +223,19 @@ static void mix8bLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
223	223	{
224	224	for (i = 0; i < (samplesToMix & 3); i++)
225	225	{
226		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	226	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
227	227	INC_POS
228	228	}
229	229	samplesToMix >>= 2;
230	230	for (i = 0; i < samplesToMix; i++)
231	231	{
232		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	232	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
233	233	INC_POS
234		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	234	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
235	235	INC_POS
236		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	236	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
237	237	INC_POS
238		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	238	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
239	239	INC_POS
240	240	}
241	241	}
@@ -243,19 +243,19 @@ static void mix8bLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
243	243	{
244	244	for (i = 0; i < (samplesToMix & 3); i++)
245	245	{
246		− RENDER_8BIT_SMP_CINTRP
	246	+ RENDER_8BIT_SMP_SINTRP
247	247	INC_POS
248	248	}
249	249	samplesToMix >>= 2;
250	250	for (i = 0; i < samplesToMix; i++)
251	251	{
252		− RENDER_8BIT_SMP_CINTRP
	252	+ RENDER_8BIT_SMP_SINTRP
253	253	INC_POS
254		− RENDER_8BIT_SMP_CINTRP
	254	+ RENDER_8BIT_SMP_SINTRP
255	255	INC_POS
256		− RENDER_8BIT_SMP_CINTRP
	256	+ RENDER_8BIT_SMP_SINTRP
257	257	INC_POS
258		− RENDER_8BIT_SMP_CINTRP
	258	+ RENDER_8BIT_SMP_SINTRP
259	259	INC_POS
260	260	}
261	261	}
@@ -266,10 +266,10 @@ static void mix8bLoopCIntrp(voice_t *v, uint32_t numSamples) · 4 unmodified lines
266	266	SET_BACK_MIXER_POS
267	267	}
268	268
269		−static void mix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	269	+static void mix8bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
270	270	{
271	271	const int8_t base, revBase, *smpPtr;
272		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	272	+ double dSample, dMixBufferL, dMixBufferR;
273	273	int32_t pos;
274	274	uint32_t i, samplesToMix, samplesLeft;
275	275	uint64_t posFrac, tmpDelta;
@@ -290,19 +290,19 @@ static void mix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
290	290	{
291	291	for (i = 0; i < (samplesToMix & 3); i++)
292	292	{
293		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	293	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
294	294	INC_POS_BIDI
295	295	}
296	296	samplesToMix >>= 2;
297	297	for (i = 0; i < samplesToMix; i++)
298	298	{
299		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	299	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
300	300	INC_POS_BIDI
301		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	301	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
302	302	INC_POS_BIDI
303		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	303	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
304	304	INC_POS_BIDI
305		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	305	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
306	306	INC_POS_BIDI
307	307	}
308	308	}
@@ -310,19 +310,19 @@ static void mix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
310	310	{
311	311	for (i = 0; i < (samplesToMix & 3); i++)
312	312	{
313		− RENDER_8BIT_SMP_CINTRP
	313	+ RENDER_8BIT_SMP_SINTRP
314	314	INC_POS_BIDI
315	315	}
316	316	samplesToMix >>= 2;
317	317	for (i = 0; i < samplesToMix; i++)
318	318	{
319		− RENDER_8BIT_SMP_CINTRP
	319	+ RENDER_8BIT_SMP_SINTRP
320	320	INC_POS_BIDI
321		− RENDER_8BIT_SMP_CINTRP
	321	+ RENDER_8BIT_SMP_SINTRP
322	322	INC_POS_BIDI
323		− RENDER_8BIT_SMP_CINTRP
	323	+ RENDER_8BIT_SMP_SINTRP
324	324	INC_POS_BIDI
325		− RENDER_8BIT_SMP_CINTRP
	325	+ RENDER_8BIT_SMP_SINTRP
326	326	INC_POS_BIDI
327	327	}
328	328	}
@@ -337,7 +337,7 @@ static void mix8bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 8 unmodified lines
337	337	static void mix8bNoLoopLIntrp(voice_t *v, uint32_t numSamples)
338	338	{
339	339	const int8_t base, smpPtr;
340		− float fSample, fMixBufferL, fMixBufferR;
	340	+ double dSample, dMixBufferL, dMixBufferR;
341	341	int32_t pos;
342	342	uint32_t i, samplesToMix, samplesLeft;
343	343	uint64_t posFrac;
@@ -379,7 +379,7 @@ static void mix8bNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
379	379	static void mix8bLoopLIntrp(voice_t *v, uint32_t numSamples)
380	380	{
381	381	const int8_t base, smpPtr;
382		− float fSample, fMixBufferL, fMixBufferR;
	382	+ double dSample, dMixBufferL, dMixBufferR;
383	383	int32_t pos;
384	384	uint32_t i, samplesToMix, samplesLeft;
385	385	uint64_t posFrac;
@@ -421,7 +421,7 @@ static void mix8bLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
421	421	static void mix8bBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
422	422	{
423	423	const int8_t base, revBase, *smpPtr;
424		− float fSample, fMixBufferL, fMixBufferR;
	424	+ double dSample, dMixBufferL, dMixBufferR;
425	425	int32_t pos;
426	426	uint32_t i, samplesToMix, samplesLeft;
427	427	uint64_t posFrac, tmpDelta;
@@ -465,9 +465,9 @@ static void mix8bBidiLoopLIntrp(voice_t *v, uint32_t numSamples) · 37 unmodified lines
465	465	static void mix8bRampNoLoop(voice_t *v, uint32_t numSamples)
466	466	{
467	467	const int8_t base, smpPtr;
468		− float fSample, fMixBufferL, fMixBufferR;
	468	+ double dSample, dMixBufferL, dMixBufferR;
469	469	int32_t pos;
470		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	470	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
471	471	uint32_t i, samplesToMix, samplesLeft;
472	472	uint64_t posFrac;
473	473
@@ -515,9 +515,9 @@ static void mix8bRampNoLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
515	515	static void mix8bRampLoop(voice_t *v, uint32_t numSamples)
516	516	{
517	517	const int8_t base, smpPtr;
518		− float fSample, fMixBufferL, fMixBufferR;
	518	+ double dSample, dMixBufferL, dMixBufferR;
519	519	int32_t pos;
520		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	520	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
521	521	uint32_t i, samplesToMix, samplesLeft;
522	522	uint64_t posFrac;
523	523
@@ -565,9 +565,9 @@ static void mix8bRampLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
565	565	static void mix8bRampBidiLoop(voice_t *v, uint32_t numSamples)
566	566	{
567	567	const int8_t base, revBase, *smpPtr;
568		− float fSample, fMixBufferL, fMixBufferR;
	568	+ double dSample, dMixBufferL, dMixBufferR;
569	569	int32_t pos;
570		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	570	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
571	571	uint32_t i, samplesToMix, samplesLeft;
572	572	uint64_t posFrac, tmpDelta;
573	573
@@ -614,12 +614,12 @@ static void mix8bRampBidiLoop(voice_t *v, uint32_t numSamples) · 40 unmodified lines
614	614	SET_BACK_MIXER_POS
615	615	}
616	616
617		−static void mix8bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	617	+static void mix8bRampNoLoopSIntrp(voice_t *v, uint32_t numSamples)
618	618	{
619	619	const int8_t base, smpPtr;
620		− float fSample, fMixBufferL, fMixBufferR;
	620	+ double dSample, dMixBufferL, dMixBufferR;
621	621	int32_t pos;
622		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	622	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
623	623	uint32_t i, samplesToMix, samplesLeft;
624	624	uint64_t posFrac;
625	625
@@ -636,23 +636,23 @@ static void mix8bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
636	636
637	637	for (i = 0; i < (samplesToMix & 3); i++)
638	638	{
639		− RENDER_8BIT_SMP_CINTRP
	639	+ RENDER_8BIT_SMP_SINTRP
640	640	VOLUME_RAMPING
641	641	INC_POS
642	642	}
643	643	samplesToMix >>= 2;
644	644	for (i = 0; i < samplesToMix; i++)
645	645	{
646		− RENDER_8BIT_SMP_CINTRP
	646	+ RENDER_8BIT_SMP_SINTRP
647	647	VOLUME_RAMPING
648	648	INC_POS
649		− RENDER_8BIT_SMP_CINTRP
	649	+ RENDER_8BIT_SMP_SINTRP
650	650	VOLUME_RAMPING
651	651	INC_POS
652		− RENDER_8BIT_SMP_CINTRP
	652	+ RENDER_8BIT_SMP_SINTRP
653	653	VOLUME_RAMPING
654	654	INC_POS
655		− RENDER_8BIT_SMP_CINTRP
	655	+ RENDER_8BIT_SMP_SINTRP
656	656	VOLUME_RAMPING
657	657	INC_POS
658	658	}
@@ -664,12 +664,12 @@ static void mix8bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 5 unmodified lines
664	664	SET_BACK_MIXER_POS
665	665	}
666	666
667		−static void mix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples)
	667	+static void mix8bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
668	668	{
669	669	const int8_t base, smpPtr;
670		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	670	+ double dSample, dMixBufferL, dMixBufferR;
671	671	int32_t pos;
672		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	672	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
673	673	uint32_t i, samplesToMix, samplesLeft;
674	674	uint64_t posFrac;
675	675
@@ -689,23 +689,23 @@ static void mix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
689	689	{
690	690	for (i = 0; i < (samplesToMix & 3); i++)
691	691	{
692		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	692	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
693	693	VOLUME_RAMPING
694	694	INC_POS
695	695	}
696	696	samplesToMix >>= 2;
697	697	for (i = 0; i < samplesToMix; i++)
698	698	{
699		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	699	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
700	700	VOLUME_RAMPING
701	701	INC_POS
702		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	702	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
703	703	VOLUME_RAMPING
704	704	INC_POS
705		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	705	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
706	706	VOLUME_RAMPING
707	707	INC_POS
708		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	708	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
709	709	VOLUME_RAMPING
710	710	INC_POS
711	711	}
@@ -714,23 +714,23 @@ static void mix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
714	714	{
715	715	for (i = 0; i < (samplesToMix & 3); i++)
716	716	{
717		− RENDER_8BIT_SMP_CINTRP
	717	+ RENDER_8BIT_SMP_SINTRP
718	718	VOLUME_RAMPING
719	719	INC_POS
720	720	}
721	721	samplesToMix >>= 2;
722	722	for (i = 0; i < samplesToMix; i++)
723	723	{
724		− RENDER_8BIT_SMP_CINTRP
	724	+ RENDER_8BIT_SMP_SINTRP
725	725	VOLUME_RAMPING
726	726	INC_POS
727		− RENDER_8BIT_SMP_CINTRP
	727	+ RENDER_8BIT_SMP_SINTRP
728	728	VOLUME_RAMPING
729	729	INC_POS
730		− RENDER_8BIT_SMP_CINTRP
	730	+ RENDER_8BIT_SMP_SINTRP
731	731	VOLUME_RAMPING
732	732	INC_POS
733		− RENDER_8BIT_SMP_CINTRP
	733	+ RENDER_8BIT_SMP_SINTRP
734	734	VOLUME_RAMPING
735	735	INC_POS
736	736	}
@@ -743,12 +743,12 @@ static void mix8bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 6 unmodified lines
743	743	SET_BACK_MIXER_POS
744	744	}
745	745
746		−static void mix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	746	+static void mix8bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
747	747	{
748	748	const int8_t base, revBase, *smpPtr;
749		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	749	+ double dSample, dMixBufferL, dMixBufferR;
750	750	int32_t pos;
751		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	751	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
752	752	uint32_t i, samplesToMix, samplesLeft;
753	753	uint64_t posFrac, tmpDelta;
754	754
@@ -769,23 +769,23 @@ static void mix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
769	769	{
770	770	for (i = 0; i < (samplesToMix & 3); i++)
771	771	{
772		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	772	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
773	773	VOLUME_RAMPING
774	774	INC_POS_BIDI
775	775	}
776	776	samplesToMix >>= 2;
777	777	for (i = 0; i < samplesToMix; i++)
778	778	{
779		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	779	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
780	780	VOLUME_RAMPING
781	781	INC_POS_BIDI
782		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	782	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
783	783	VOLUME_RAMPING
784	784	INC_POS_BIDI
785		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	785	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
786	786	VOLUME_RAMPING
787	787	INC_POS_BIDI
788		− RENDER_8BIT_SMP_CINTRP_TAP_FIX
	788	+ RENDER_8BIT_SMP_SINTRP_TAP_FIX
789	789	VOLUME_RAMPING
790	790	INC_POS_BIDI
791	791	}
@@ -794,23 +794,23 @@ static void mix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
794	794	{
795	795	for (i = 0; i < (samplesToMix & 3); i++)
796	796	{
797		− RENDER_8BIT_SMP_CINTRP
	797	+ RENDER_8BIT_SMP_SINTRP
798	798	VOLUME_RAMPING
799	799	INC_POS_BIDI
800	800	}
801	801	samplesToMix >>= 2;
802	802	for (i = 0; i < samplesToMix; i++)
803	803	{
804		− RENDER_8BIT_SMP_CINTRP
	804	+ RENDER_8BIT_SMP_SINTRP
805	805	VOLUME_RAMPING
806	806	INC_POS_BIDI
807		− RENDER_8BIT_SMP_CINTRP
	807	+ RENDER_8BIT_SMP_SINTRP
808	808	VOLUME_RAMPING
809	809	INC_POS_BIDI
810		− RENDER_8BIT_SMP_CINTRP
	810	+ RENDER_8BIT_SMP_SINTRP
811	811	VOLUME_RAMPING
812	812	INC_POS_BIDI
813		− RENDER_8BIT_SMP_CINTRP
	813	+ RENDER_8BIT_SMP_SINTRP
814	814	VOLUME_RAMPING
815	815	INC_POS_BIDI
816	816	}
@@ -827,9 +827,9 @@ static void mix8bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
827	827	static void mix8bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples)
828	828	{
829	829	const int8_t base, smpPtr;
830		− float fSample, fMixBufferL, fMixBufferR;
	830	+ double dSample, dMixBufferL, dMixBufferR;
831	831	int32_t pos;
832		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	832	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
833	833	uint32_t i, samplesToMix, samplesLeft;
834	834	uint64_t posFrac;
835	835
@@ -877,9 +877,9 @@ static void mix8bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
877	877	static void mix8bRampLoopLIntrp(voice_t *v, uint32_t numSamples)
878	878	{
879	879	const int8_t base, smpPtr;
880		− float fSample, fMixBufferL, fMixBufferR;
	880	+ double dSample, dMixBufferL, dMixBufferR;
881	881	int32_t pos;
882		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	882	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
883	883	uint32_t i, samplesToMix, samplesLeft;
884	884	uint64_t posFrac;
885	885
@@ -927,9 +927,9 @@ static void mix8bRampLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
927	927	static void mix8bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
928	928	{
929	929	const int8_t base, revBase, *smpPtr;
930		− float fSample, fMixBufferL, fMixBufferR;
	930	+ double dSample, dMixBufferL, dMixBufferR;
931	931	int32_t pos;
932		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	932	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
933	933	uint32_t i, samplesToMix, samplesLeft;
934	934	uint64_t posFrac, tmpDelta;
935	935
@@ -983,7 +983,7 @@ static void mix8bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples) · 47 unmodified lines
983	983	static void mix16bNoLoop(voice_t *v, uint32_t numSamples)
984	984	{
985	985	const int16_t base, smpPtr;
986		− float fSample, fMixBufferL, fMixBufferR;
	986	+ double dSample, dMixBufferL, dMixBufferR;
987	987	int32_t pos;
988	988	uint32_t i, samplesToMix, samplesLeft;
989	989	uint64_t posFrac;
@@ -1025,7 +1025,7 @@ static void mix16bNoLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1025	1025	static void mix16bLoop(voice_t *v, uint32_t numSamples)
1026	1026	{
1027	1027	const int16_t base, smpPtr;
1028		− float fSample, fMixBufferL, fMixBufferR;
	1028	+ double dSample, dMixBufferL, dMixBufferR;
1029	1029	int32_t pos;
1030	1030	uint32_t i, samplesToMix, samplesLeft;
1031	1031	uint64_t posFrac;
@@ -1067,7 +1067,7 @@ static void mix16bLoop(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1067	1067	static void mix16bBidiLoop(voice_t *v, uint32_t numSamples)
1068	1068	{
1069	1069	const int16_t base, revBase, *smpPtr;
1070		− float fSample, fMixBufferL, fMixBufferR;
	1070	+ double dSample, dMixBufferL, dMixBufferR;
1071	1071	int32_t pos;
1072	1072	uint32_t i, samplesToMix, samplesLeft;
1073	1073	uint64_t posFrac, tmpDelta;
@@ -1108,10 +1108,10 @@ static void mix16bBidiLoop(voice_t *v, uint32_t numSamples) · 34 unmodified lines
1108	1108	SET_BACK_MIXER_POS
1109	1109	}
1110	1110
1111		−static void mix16bNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	1111	+static void mix16bNoLoopSIntrp(voice_t *v, uint32_t numSamples)
1112	1112	{
1113	1113	const int16_t base, smpPtr;
1114		− float fSample, fMixBufferL, fMixBufferR;
	1114	+ double dSample, dMixBufferL, dMixBufferR;
1115	1115	int32_t pos;
1116	1116	uint32_t i, samplesToMix, samplesLeft;
1117	1117	uint64_t posFrac;
@@ -1128,19 +1128,19 @@ static void mix16bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
1128	1128
1129	1129	for (i = 0; i < (samplesToMix & 3); i++)
1130	1130	{
1131		− RENDER_16BIT_SMP_CINTRP
	1131	+ RENDER_16BIT_SMP_SINTRP
1132	1132	INC_POS
1133	1133	}
1134	1134	samplesToMix >>= 2;
1135	1135	for (i = 0; i < samplesToMix; i++)
1136	1136	{
1137		− RENDER_16BIT_SMP_CINTRP
	1137	+ RENDER_16BIT_SMP_SINTRP
1138	1138	INC_POS
1139		− RENDER_16BIT_SMP_CINTRP
	1139	+ RENDER_16BIT_SMP_SINTRP
1140	1140	INC_POS
1141		− RENDER_16BIT_SMP_CINTRP
	1141	+ RENDER_16BIT_SMP_SINTRP
1142	1142	INC_POS
1143		− RENDER_16BIT_SMP_CINTRP
	1143	+ RENDER_16BIT_SMP_SINTRP
1144	1144	INC_POS
1145	1145	}
1146	1146
@@ -1150,10 +1150,10 @@ static void mix16bNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 3 unmodified lines
1150	1150	SET_BACK_MIXER_POS
1151	1151	}
1152	1152
1153		−static void mix16bLoopCIntrp(voice_t *v, uint32_t numSamples)
	1153	+static void mix16bLoopSIntrp(voice_t *v, uint32_t numSamples)
1154	1154	{
1155	1155	const int16_t base, smpPtr;
1156		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1156	+ double dSample, dMixBufferL, dMixBufferR;
1157	1157	int32_t pos;
1158	1158	uint32_t i, samplesToMix, samplesLeft;
1159	1159	uint64_t posFrac;
@@ -1173,19 +1173,19 @@ static void mix16bLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
1173	1173	{
1174	1174	for (i = 0; i < (samplesToMix & 3); i++)
1175	1175	{
1176		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1176	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1177	1177	INC_POS
1178	1178	}
1179	1179	samplesToMix >>= 2;
1180	1180	for (i = 0; i < samplesToMix; i++)
1181	1181	{
1182		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1182	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1183	1183	INC_POS
1184		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1184	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1185	1185	INC_POS
1186		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1186	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1187	1187	INC_POS
1188		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1188	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1189	1189	INC_POS
1190	1190	}
1191	1191	}
@@ -1193,19 +1193,19 @@ static void mix16bLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
1193	1193	{
1194	1194	for (i = 0; i < (samplesToMix & 3); i++)
1195	1195	{
1196		− RENDER_16BIT_SMP_CINTRP
	1196	+ RENDER_16BIT_SMP_SINTRP
1197	1197	INC_POS
1198	1198	}
1199	1199	samplesToMix >>= 2;
1200	1200	for (i = 0; i < samplesToMix; i++)
1201	1201	{
1202		− RENDER_16BIT_SMP_CINTRP
	1202	+ RENDER_16BIT_SMP_SINTRP
1203	1203	INC_POS
1204		− RENDER_16BIT_SMP_CINTRP
	1204	+ RENDER_16BIT_SMP_SINTRP
1205	1205	INC_POS
1206		− RENDER_16BIT_SMP_CINTRP
	1206	+ RENDER_16BIT_SMP_SINTRP
1207	1207	INC_POS
1208		− RENDER_16BIT_SMP_CINTRP
	1208	+ RENDER_16BIT_SMP_SINTRP
1209	1209	INC_POS
1210	1210	}
1211	1211	}
@@ -1216,10 +1216,10 @@ static void mix16bLoopCIntrp(voice_t *v, uint32_t numSamples) · 4 unmodified lines
1216	1216	SET_BACK_MIXER_POS
1217	1217	}
1218	1218
1219		−static void mix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	1219	+static void mix16bBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
1220	1220	{
1221	1221	const int16_t base, revBase, *smpPtr;
1222		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1222	+ double dSample, dMixBufferL, dMixBufferR;
1223	1223	int32_t pos;
1224	1224	uint32_t i, samplesToMix, samplesLeft;
1225	1225	uint64_t posFrac, tmpDelta;
@@ -1240,19 +1240,19 @@ static void mix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
1240	1240	{
1241	1241	for (i = 0; i < (samplesToMix & 3); i++)
1242	1242	{
1243		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1243	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1244	1244	INC_POS_BIDI
1245	1245	}
1246	1246	samplesToMix >>= 2;
1247	1247	for (i = 0; i < samplesToMix; i++)
1248	1248	{
1249		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1249	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1250	1250	INC_POS_BIDI
1251		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1251	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1252	1252	INC_POS_BIDI
1253		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1253	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1254	1254	INC_POS_BIDI
1255		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1255	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1256	1256	INC_POS_BIDI
1257	1257	}
1258	1258	}
@@ -1260,19 +1260,19 @@ static void mix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 1 unmodified line
1260	1260	{
1261	1261	for (i = 0; i < (samplesToMix & 3); i++)
1262	1262	{
1263		− RENDER_16BIT_SMP_CINTRP
	1263	+ RENDER_16BIT_SMP_SINTRP
1264	1264	INC_POS_BIDI
1265	1265	}
1266	1266	samplesToMix >>= 2;
1267	1267	for (i = 0; i < samplesToMix; i++)
1268	1268	{
1269		− RENDER_16BIT_SMP_CINTRP
	1269	+ RENDER_16BIT_SMP_SINTRP
1270	1270	INC_POS_BIDI
1271		− RENDER_16BIT_SMP_CINTRP
	1271	+ RENDER_16BIT_SMP_SINTRP
1272	1272	INC_POS_BIDI
1273		− RENDER_16BIT_SMP_CINTRP
	1273	+ RENDER_16BIT_SMP_SINTRP
1274	1274	INC_POS_BIDI
1275		− RENDER_16BIT_SMP_CINTRP
	1275	+ RENDER_16BIT_SMP_SINTRP
1276	1276	INC_POS_BIDI
1277	1277	}
1278	1278	}
@@ -1287,7 +1287,7 @@ static void mix16bBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 8 unmodified lines
1287	1287	static void mix16bNoLoopLIntrp(voice_t *v, uint32_t numSamples)
1288	1288	{
1289	1289	const int16_t base, smpPtr;
1290		− float fSample, fMixBufferL, fMixBufferR;
	1290	+ double dSample, dMixBufferL, dMixBufferR;
1291	1291	int32_t pos;
1292	1292	uint32_t i, samplesToMix, samplesLeft;
1293	1293	uint64_t posFrac;
@@ -1329,7 +1329,7 @@ static void mix16bNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1329	1329	static void mix16bLoopLIntrp(voice_t *v, uint32_t numSamples)
1330	1330	{
1331	1331	const int16_t base, smpPtr;
1332		− float fSample, fMixBufferL, fMixBufferR;
	1332	+ double dSample, dMixBufferL, dMixBufferR;
1333	1333	int32_t pos;
1334	1334	uint32_t i, samplesToMix, samplesLeft;
1335	1335	uint64_t posFrac;
@@ -1371,7 +1371,7 @@ static void mix16bLoopLIntrp(voice_t *v, uint32_t numSamples) · 35 unmodified lines
1371	1371	static void mix16bBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
1372	1372	{
1373	1373	const int16_t base, revBase, *smpPtr;
1374		− float fSample, fMixBufferL, fMixBufferR;
	1374	+ double dSample, dMixBufferL, dMixBufferR;
1375	1375	int32_t pos;
1376	1376	uint32_t i, samplesToMix, samplesLeft;
1377	1377	uint64_t posFrac, tmpDelta;
@@ -1415,9 +1415,9 @@ static void mix16bBidiLoopLIntrp(voice_t *v, uint32_t numSamples) · 37 unmodified lines
1415	1415	static void mix16bRampNoLoop(voice_t *v, uint32_t numSamples)
1416	1416	{
1417	1417	const int16_t base, smpPtr;
1418		− float fSample, fMixBufferL, fMixBufferR;
	1418	+ double dSample, dMixBufferL, dMixBufferR;
1419	1419	int32_t pos;
1420		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1420	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1421	1421	uint32_t i, samplesToMix, samplesLeft;
1422	1422	uint64_t posFrac;
1423	1423
@@ -1465,9 +1465,9 @@ static void mix16bRampNoLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1465	1465	static void mix16bRampLoop(voice_t *v, uint32_t numSamples)
1466	1466	{
1467	1467	const int16_t base, smpPtr;
1468		− float fSample, fMixBufferL, fMixBufferR;
	1468	+ double dSample, dMixBufferL, dMixBufferR;
1469	1469	int32_t pos;
1470		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1470	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1471	1471	uint32_t i, samplesToMix, samplesLeft;
1472	1472	uint64_t posFrac;
1473	1473
@@ -1515,9 +1515,9 @@ static void mix16bRampLoop(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1515	1515	static void mix16bRampBidiLoop(voice_t *v, uint32_t numSamples)
1516	1516	{
1517	1517	const int16_t base, revBase, *smpPtr;
1518		− float fSample, fMixBufferL, fMixBufferR;
	1518	+ double dSample, dMixBufferL, dMixBufferR;
1519	1519	int32_t pos;
1520		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1520	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1521	1521	uint32_t i, samplesToMix, samplesLeft;
1522	1522	uint64_t posFrac, tmpDelta;
1523	1523
@@ -1564,12 +1564,12 @@ static void mix16bRampBidiLoop(voice_t *v, uint32_t numSamples) · 40 unmodified lines
1564	1564	SET_BACK_MIXER_POS
1565	1565	}
1566	1566
1567		−static void mix16bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples)
	1567	+static void mix16bRampNoLoopSIntrp(voice_t *v, uint32_t numSamples)
1568	1568	{
1569	1569	const int16_t base, smpPtr;
1570		− float fSample, fMixBufferL, fMixBufferR;
	1570	+ double dSample, dMixBufferL, dMixBufferR;
1571	1571	int32_t pos;
1572		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1572	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1573	1573	uint32_t i, samplesToMix, samplesLeft;
1574	1574	uint64_t posFrac;
1575	1575
@@ -1586,23 +1586,23 @@ static void mix16bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
1586	1586
1587	1587	for (i = 0; i < (samplesToMix & 3); i++)
1588	1588	{
1589		− RENDER_16BIT_SMP_CINTRP
	1589	+ RENDER_16BIT_SMP_SINTRP
1590	1590	VOLUME_RAMPING
1591	1591	INC_POS
1592	1592	}
1593	1593	samplesToMix >>= 2;
1594	1594	for (i = 0; i < samplesToMix; i++)
1595	1595	{
1596		− RENDER_16BIT_SMP_CINTRP
	1596	+ RENDER_16BIT_SMP_SINTRP
1597	1597	VOLUME_RAMPING
1598	1598	INC_POS
1599		− RENDER_16BIT_SMP_CINTRP
	1599	+ RENDER_16BIT_SMP_SINTRP
1600	1600	VOLUME_RAMPING
1601	1601	INC_POS
1602		− RENDER_16BIT_SMP_CINTRP
	1602	+ RENDER_16BIT_SMP_SINTRP
1603	1603	VOLUME_RAMPING
1604	1604	INC_POS
1605		− RENDER_16BIT_SMP_CINTRP
	1605	+ RENDER_16BIT_SMP_SINTRP
1606	1606	VOLUME_RAMPING
1607	1607	INC_POS
1608	1608	}
@@ -1614,12 +1614,12 @@ static void mix16bRampNoLoopCIntrp(voice_t *v, uint32_t numSamples) · 5 unmodified lines
1614	1614	SET_BACK_MIXER_POS
1615	1615	}
1616	1616
1617		−static void mix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples)
	1617	+static void mix16bRampLoopSIntrp(voice_t *v, uint32_t numSamples)
1618	1618	{
1619	1619	const int16_t base, smpPtr;
1620		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1620	+ double dSample, dMixBufferL, dMixBufferR;
1621	1621	int32_t pos;
1622		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1622	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1623	1623	uint32_t i, samplesToMix, samplesLeft;
1624	1624	uint64_t posFrac;
1625	1625
@@ -1639,23 +1639,23 @@ static void mix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 13 unmodified lines
1639	1639	{
1640	1640	for (i = 0; i < (samplesToMix & 3); i++)
1641	1641	{
1642		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1642	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1643	1643	VOLUME_RAMPING
1644	1644	INC_POS
1645	1645	}
1646	1646	samplesToMix >>= 2;
1647	1647	for (i = 0; i < samplesToMix; i++)
1648	1648	{
1649		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1649	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1650	1650	VOLUME_RAMPING
1651	1651	INC_POS
1652		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1652	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1653	1653	VOLUME_RAMPING
1654	1654	INC_POS
1655		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1655	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1656	1656	VOLUME_RAMPING
1657	1657	INC_POS
1658		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1658	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1659	1659	VOLUME_RAMPING
1660	1660	INC_POS
1661	1661	}
@@ -1664,23 +1664,23 @@ static void mix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
1664	1664	{
1665	1665	for (i = 0; i < (samplesToMix & 3); i++)
1666	1666	{
1667		− RENDER_16BIT_SMP_CINTRP
	1667	+ RENDER_16BIT_SMP_SINTRP
1668	1668	VOLUME_RAMPING
1669	1669	INC_POS
1670	1670	}
1671	1671	samplesToMix >>= 2;
1672	1672	for (i = 0; i < samplesToMix; i++)
1673	1673	{
1674		− RENDER_16BIT_SMP_CINTRP
	1674	+ RENDER_16BIT_SMP_SINTRP
1675	1675	VOLUME_RAMPING
1676	1676	INC_POS
1677		− RENDER_16BIT_SMP_CINTRP
	1677	+ RENDER_16BIT_SMP_SINTRP
1678	1678	VOLUME_RAMPING
1679	1679	INC_POS
1680		− RENDER_16BIT_SMP_CINTRP
	1680	+ RENDER_16BIT_SMP_SINTRP
1681	1681	VOLUME_RAMPING
1682	1682	INC_POS
1683		− RENDER_16BIT_SMP_CINTRP
	1683	+ RENDER_16BIT_SMP_SINTRP
1684	1684	VOLUME_RAMPING
1685	1685	INC_POS
1686	1686	}
@@ -1693,12 +1693,12 @@ static void mix16bRampLoopCIntrp(voice_t *v, uint32_t numSamples) · 6 unmodified lines
1693	1693	SET_BACK_MIXER_POS
1694	1694	}
1695	1695
1696		−static void mix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples)
	1696	+static void mix16bRampBidiLoopSIntrp(voice_t *v, uint32_t numSamples)
1697	1697	{
1698	1698	const int16_t base, revBase, *smpPtr;
1699		− float s0, s1, s2, s3, fSample, fMixBufferL, fMixBufferR;
	1699	+ double dSample, dMixBufferL, dMixBufferR;
1700	1700	int32_t pos;
1701		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1701	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1702	1702	uint32_t i, samplesToMix, samplesLeft;
1703	1703	uint64_t posFrac, tmpDelta;
1704	1704
@@ -1719,23 +1719,23 @@ static void mix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 14 unmodified lines
1719	1719	{
1720	1720	for (i = 0; i < (samplesToMix & 3); i++)
1721	1721	{
1722		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1722	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1723	1723	VOLUME_RAMPING
1724	1724	INC_POS_BIDI
1725	1725	}
1726	1726	samplesToMix >>= 2;
1727	1727	for (i = 0; i < samplesToMix; i++)
1728	1728	{
1729		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1729	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1730	1730	VOLUME_RAMPING
1731	1731	INC_POS_BIDI
1732		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1732	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1733	1733	VOLUME_RAMPING
1734	1734	INC_POS_BIDI
1735		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1735	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1736	1736	VOLUME_RAMPING
1737	1737	INC_POS_BIDI
1738		− RENDER_16BIT_SMP_CINTRP_TAP_FIX
	1738	+ RENDER_16BIT_SMP_SINTRP_TAP_FIX
1739	1739	VOLUME_RAMPING
1740	1740	INC_POS_BIDI
1741	1741	}
@@ -1744,23 +1744,23 @@ static void mix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 2 unmodified lines
1744	1744	{
1745	1745	for (i = 0; i < (samplesToMix & 3); i++)
1746	1746	{
1747		− RENDER_16BIT_SMP_CINTRP
	1747	+ RENDER_16BIT_SMP_SINTRP
1748	1748	VOLUME_RAMPING
1749	1749	INC_POS_BIDI
1750	1750	}
1751	1751	samplesToMix >>= 2;
1752	1752	for (i = 0; i < samplesToMix; i++)
1753	1753	{
1754		− RENDER_16BIT_SMP_CINTRP
	1754	+ RENDER_16BIT_SMP_SINTRP
1755	1755	VOLUME_RAMPING
1756	1756	INC_POS_BIDI
1757		− RENDER_16BIT_SMP_CINTRP
	1757	+ RENDER_16BIT_SMP_SINTRP
1758	1758	VOLUME_RAMPING
1759	1759	INC_POS_BIDI
1760		− RENDER_16BIT_SMP_CINTRP
	1760	+ RENDER_16BIT_SMP_SINTRP
1761	1761	VOLUME_RAMPING
1762	1762	INC_POS_BIDI
1763		− RENDER_16BIT_SMP_CINTRP
	1763	+ RENDER_16BIT_SMP_SINTRP
1764	1764	VOLUME_RAMPING
1765	1765	INC_POS_BIDI
1766	1766	}
@@ -1777,9 +1777,9 @@ static void mix16bRampBidiLoopCIntrp(voice_t *v, uint32_t numSamples) · 10 unmodified lines
1777	1777	static void mix16bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples)
1778	1778	{
1779	1779	const int16_t base, smpPtr;
1780		− float fSample, fMixBufferL, fMixBufferR;
	1780	+ double dSample, dMixBufferL, dMixBufferR;
1781	1781	int32_t pos;
1782		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1782	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1783	1783	uint32_t i, samplesToMix, samplesLeft;
1784	1784	uint64_t posFrac;
1785	1785
@@ -1827,9 +1827,9 @@ static void mix16bRampNoLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1827	1827	static void mix16bRampLoopLIntrp(voice_t *v, uint32_t numSamples)
1828	1828	{
1829	1829	const int16_t base, smpPtr;
1830		− float fSample, fMixBufferL, fMixBufferR;
	1830	+ double dSample, dMixBufferL, dMixBufferR;
1831	1831	int32_t pos;
1832		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1832	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1833	1833	uint32_t i, samplesToMix, samplesLeft;
1834	1834	uint64_t posFrac;
1835	1835
@@ -1877,9 +1877,9 @@ static void mix16bRampLoopLIntrp(voice_t *v, uint32_t numSamples) · 41 unmodified lines
1877	1877	static void mix16bRampBidiLoopLIntrp(voice_t *v, uint32_t numSamples)
1878	1878	{
1879	1879	const int16_t base, revBase, *smpPtr;
1880		− float fSample, fMixBufferL, fMixBufferR;
	1880	+ double dSample, dMixBufferL, dMixBufferR;
1881	1881	int32_t pos;
1882		− float fVolLDelta, fVolRDelta, fVolL, fVolR;
	1882	+ double dVolLDelta, dVolRDelta, dVolL, dVolR;
1883	1883	uint32_t i, samplesToMix, samplesLeft;
1884	1884	uint64_t posFrac, tmpDelta;
1885	1885
@@ -1942,9 +1942,9 @@ const mixFunc mixFuncTab[72] = · 56 unmodified lines
1942	1942	(mixFunc)mix8bNoLoop,
1943	1943	(mixFunc)mix8bLoop,
1944	1944	(mixFunc)mix8bBidiLoop,
1945		− (mixFunc)mix8bNoLoopCIntrp,
1946		− (mixFunc)mix8bLoopCIntrp,
1947		− (mixFunc)mix8bBidiLoopCIntrp,
	1945	+ (mixFunc)mix8bNoLoopSIntrp,
	1946	+ (mixFunc)mix8bLoopSIntrp,
	1947	+ (mixFunc)mix8bBidiLoopSIntrp,
1948	1948	(mixFunc)mix8bNoLoopLIntrp,
1949	1949	(mixFunc)mix8bLoopLIntrp,
1950	1950	(mixFunc)mix8bBidiLoopLIntrp,
@@ -1953,9 +1953,9 @@ const mixFunc mixFuncTab[72] = · 2 unmodified lines
1953	1953	(mixFunc)mix16bNoLoop,
1954	1954	(mixFunc)mix16bLoop,
1955	1955	(mixFunc)mix16bBidiLoop,
1956		− (mixFunc)mix16bNoLoopCIntrp,
1957		− (mixFunc)mix16bLoopCIntrp,
1958		− (mixFunc)mix16bBidiLoopCIntrp,
	1956	+ (mixFunc)mix16bNoLoopSIntrp,
	1957	+ (mixFunc)mix16bLoopSIntrp,
	1958	+ (mixFunc)mix16bBidiLoopSIntrp,
1959	1959	(mixFunc)mix16bNoLoopLIntrp,
1960	1960	(mixFunc)mix16bLoopLIntrp,
1961	1961	(mixFunc)mix16bBidiLoopLIntrp,
@@ -1966,9 +1966,9 @@ const mixFunc mixFuncTab[72] = · 4 unmodified lines
1966	1966	(mixFunc)mix8bRampNoLoop,
1967	1967	(mixFunc)mix8bRampLoop,
1968	1968	(mixFunc)mix8bRampBidiLoop,
1969		− (mixFunc)mix8bRampNoLoopCIntrp,
1970		− (mixFunc)mix8bRampLoopCIntrp,
1971		− (mixFunc)mix8bRampBidiLoopCIntrp,
	1969	+ (mixFunc)mix8bRampNoLoopSIntrp,
	1970	+ (mixFunc)mix8bRampLoopSIntrp,
	1971	+ (mixFunc)mix8bRampBidiLoopSIntrp,
1972	1972	(mixFunc)mix8bRampNoLoopLIntrp,
1973	1973	(mixFunc)mix8bRampLoopLIntrp,
1974	1974	(mixFunc)mix8bRampBidiLoopLIntrp,
@@ -1977,9 +1977,9 @@ const mixFunc mixFuncTab[72] = · 2 unmodified lines
1977	1977	(mixFunc)mix16bRampNoLoop,
1978	1978	(mixFunc)mix16bRampLoop,
1979	1979	(mixFunc)mix16bRampBidiLoop,
1980		− (mixFunc)mix16bRampNoLoopCIntrp,
1981		− (mixFunc)mix16bRampLoopCIntrp,
1982		− (mixFunc)mix16bRampBidiLoopCIntrp,
	1980	+ (mixFunc)mix16bRampNoLoopSIntrp,
	1981	+ (mixFunc)mix16bRampLoopSIntrp,
	1982	+ (mixFunc)mix16bRampBidiLoopSIntrp,
1983	1983	(mixFunc)mix16bRampNoLoopLIntrp,
1984	1984	(mixFunc)mix16bRampLoopLIntrp,
1985	1985	(mixFunc)mix16bRampBidiLoopLIntrp,
@@ -1996,9 +1996,9 @@ const mixFunc mixFuncTab[72] = · 10 unmodified lines
1996	1996	(mixFunc)centerMix8bNoLoop,
1997	1997	(mixFunc)centerMix8bLoop,
1998	1998	(mixFunc)centerMix8bBidiLoop,
1999		− (mixFunc)centerMix8bNoLoopCIntrp,
2000		− (mixFunc)centerMix8bLoopCIntrp,
2001		− (mixFunc)centerMix8bBidiLoopCIntrp,
	1999	+ (mixFunc)centerMix8bNoLoopSIntrp,
	2000	+ (mixFunc)centerMix8bLoopSIntrp,
	2001	+ (mixFunc)centerMix8bBidiLoopSIntrp,
2002	2002	(mixFunc)centerMix8bNoLoopLIntrp,
2003	2003	(mixFunc)centerMix8bLoopLIntrp,
2004	2004	(mixFunc)centerMix8bBidiLoopLIntrp,
@@ -2007,9 +2007,9 @@ const mixFunc mixFuncTab[72] = · 2 unmodified lines
2007	2007	(mixFunc)centerMix16bNoLoop,
2008	2008	(mixFunc)centerMix16bLoop,
2009	2009	(mixFunc)centerMix16bBidiLoop,
2010		− (mixFunc)centerMix16bNoLoopCIntrp,
2011		− (mixFunc)centerMix16bLoopCIntrp,
2012		− (mixFunc)centerMix16bBidiLoopCIntrp,
	2010	+ (mixFunc)centerMix16bNoLoopSIntrp,
	2011	+ (mixFunc)centerMix16bLoopSIntrp,
	2012	+ (mixFunc)centerMix16bBidiLoopSIntrp,
2013	2013	(mixFunc)centerMix16bNoLoopLIntrp,
2014	2014	(mixFunc)centerMix16bLoopLIntrp,
2015	2015	(mixFunc)centerMix16bBidiLoopLIntrp,
@@ -2020,9 +2020,9 @@ const mixFunc mixFuncTab[72] = · 4 unmodified lines
2020	2020	(mixFunc)centerMix8bRampNoLoop,
2021	2021	(mixFunc)centerMix8bRampLoop,
2022	2022	(mixFunc)centerMix8bRampBidiLoop,
2023		− (mixFunc)centerMix8bRampNoLoopCIntrp,
2024		− (mixFunc)centerMix8bRampLoopCIntrp,
2025		− (mixFunc)centerMix8bRampBidiLoopCIntrp,
	2023	+ (mixFunc)centerMix8bRampNoLoopSIntrp,
	2024	+ (mixFunc)centerMix8bRampLoopSIntrp,
	2025	+ (mixFunc)centerMix8bRampBidiLoopSIntrp,
2026	2026	(mixFunc)centerMix8bRampNoLoopLIntrp,
2027	2027	(mixFunc)centerMix8bRampLoopLIntrp,
2028	2028	(mixFunc)centerMix8bRampBidiLoopLIntrp,
@@ -2031,9 +2031,9 @@ const mixFunc mixFuncTab[72] = · 2 unmodified lines
2031	2031	(mixFunc)centerMix16bRampNoLoop,
2032	2032	(mixFunc)centerMix16bRampLoop,
2033	2033	(mixFunc)centerMix16bRampBidiLoop,
2034		− (mixFunc)centerMix16bRampNoLoopCIntrp,
2035		− (mixFunc)centerMix16bRampLoopCIntrp,
2036		− (mixFunc)centerMix16bRampBidiLoopCIntrp,
	2034	+ (mixFunc)centerMix16bRampNoLoopSIntrp,
	2035	+ (mixFunc)centerMix16bRampLoopSIntrp,
	2036	+ (mixFunc)centerMix16bRampBidiLoopSIntrp,
2037	2037	(mixFunc)centerMix16bRampNoLoopLIntrp,
2038	2038	(mixFunc)centerMix16bRampLoopLIntrp,
2039	2039	(mixFunc)centerMix16bRampBidiLoopLIntrp

src/mixer/ft2_mix_macros.h+156−117

@@ -2,64 +2,64 @@ · 1 unmodified line
2	2
3	3	#include <assert.h>
4	4	#include "../ft2_audio.h"
5		−#include "ft2_cubicspline.h"
	5	+#include "ft2_windowed_sinc.h"
6	6
7	7	/* ----------------------------------------------------------------------- */
8	8	/* GENERAL MIXER MACROS */
9	9	/* ----------------------------------------------------------------------- */
10	10
11	11	#define GET_VOL \
12		− const float fVolL = v->fVolL; \
13		− const float fVolR = v->fVolR; \
	12	+ const double dVolL = v->dVolL; \
	13	+ const double dVolR = v->dVolR; \
14	14
15	15	#define GET_VOL_MONO \
16		− const float fVolL = v->fVolL; \
	16	+ const double dVolL = v->dVolL; \
17	17
18	18	#define GET_VOL_RAMP \
19		− fVolL = v->fVolL; \
20		− fVolR = v->fVolR; \
	19	+ dVolL = v->dVolL; \
	20	+ dVolR = v->dVolR; \
21	21
22	22	#define GET_VOL_MONO_RAMP \
23		− fVolL = v->fVolL; \
	23	+ dVolL = v->dVolL; \
24	24
25	25	#define SET_VOL_BACK \
26		− v->fVolL = fVolL; \
27		− v->fVolR = fVolR; \
	26	+ v->dVolL = dVolL; \
	27	+ v->dVolR = dVolR; \
28	28
29	29	#define SET_VOL_BACK_MONO \
30		− v->fVolL = v->fVolR = fVolL; \
	30	+ v->dVolL = v->dVolR = dVolL; \
31	31
32	32	#define GET_MIXER_VARS \
33	33	const uint64_t delta = v->delta; \
34		− fMixBufferL = audio.fMixBufferL; \
35		− fMixBufferR = audio.fMixBufferR; \
	34	+ dMixBufferL = audio.dMixBufferL; \
	35	+ dMixBufferR = audio.dMixBufferR; \
36	36	pos = v->pos; \
37	37	posFrac = v->posFrac; \
38	38
39	39	#define GET_MIXER_VARS_RAMP \
40	40	const uint64_t delta = v->delta; \
41		− fMixBufferL = audio.fMixBufferL; \
42		− fMixBufferR = audio.fMixBufferR; \
43		− fVolLDelta = v->fVolDeltaL; \
44		− fVolRDelta = v->fVolDeltaR; \
	41	+ dMixBufferL = audio.dMixBufferL; \
	42	+ dMixBufferR = audio.dMixBufferR; \
	43	+ dVolLDelta = v->dVolDeltaL; \
	44	+ dVolRDelta = v->dVolDeltaR; \
45	45	pos = v->pos; \
46	46	posFrac = v->posFrac; \
47	47
48	48	#define GET_MIXER_VARS_MONO_RAMP \
49	49	const uint64_t delta = v->delta; \
50		− fMixBufferL = audio.fMixBufferL; \
51		− fMixBufferR = audio.fMixBufferR; \
52		− fVolLDelta = v->fVolDeltaL; \
	50	+ dMixBufferL = audio.dMixBufferL; \
	51	+ dMixBufferR = audio.dMixBufferR; \
	52	+ dVolLDelta = v->dVolDeltaL; \
53	53	pos = v->pos; \
54	54	posFrac = v->posFrac; \
55	55
56	56	#define PREPARE_TAP_FIX8 \
57	57	const int8_t *loopStartPtr = &v->base8[v->loopStart]; \
58		− const float fTapFixSample = v->fTapFixSample; \
	58	+ const int8_t *leftEdgePtr = loopStartPtr+SINC_LEFT_TAPS; \
59	59
60	60	#define PREPARE_TAP_FIX16 \
61	61	const int16_t *loopStartPtr = &v->base16[v->loopStart]; \
62		− const float fTapFixSample = v->fTapFixSample; \
	62	+ const int16_t *leftEdgePtr = loopStartPtr+SINC_LEFT_TAPS; \
63	63
64	64	#define SET_BASE8 \
65	65	base = v->base8; \
@@ -97,77 +97,77 @@ · 31 unmodified lines
97	97	/* ----------------------------------------------------------------------- */
98	98
99	99	#define VOLUME_RAMPING \
100		− fVolL += fVolLDelta; \
101		− fVolR += fVolRDelta; \
	100	+ dVolL += dVolLDelta; \
	101	+ dVolR += dVolRDelta; \
102	102
103	103	#define VOLUME_RAMPING_MONO \
104		− fVolL += fVolLDelta; \
	104	+ dVolL += dVolLDelta; \
105	105
106	106	#define RENDER_8BIT_SMP \
107	107	assert(smpPtr >= base && smpPtr < base+v->end); \
108		− fSample = smpPtr (1.0f / 128.0f); \
109		− fMixBufferL++ += fSample fVolL; \
110		− fMixBufferR++ += fSample fVolR; \
	108	+ dSample = smpPtr (1.0 / 128.0); \
	109	+ dMixBufferL++ += dSample dVolL; \
	110	+ dMixBufferR++ += dSample dVolR; \
111	111
112	112	#define RENDER_8BIT_SMP_MONO \
113	113	assert(smpPtr >= base && smpPtr < base+v->end); \
114		− fSample = (smpPtr (1.0f / 128.0f)) * fVolL; \
115		− *fMixBufferL++ += fSample; \
116		− *fMixBufferR++ += fSample; \
	114	+ dSample = (smpPtr (1.0 / 128.0)) * dVolL; \
	115	+ *dMixBufferL++ += dSample; \
	116	+ *dMixBufferR++ += dSample; \
117	117
118	118	#define RENDER_16BIT_SMP \
119	119	assert(smpPtr >= base && smpPtr < base+v->end); \
120		− fSample = smpPtr (1.0f / 32768.0f); \
121		− fMixBufferL++ += fSample fVolL; \
122		− fMixBufferR++ += fSample fVolR; \
	120	+ dSample = smpPtr (1.0 / 32768.0); \
	121	+ dMixBufferL++ += dSample dVolL; \
	122	+ dMixBufferR++ += dSample dVolR; \
123	123
124	124	#define RENDER_16BIT_SMP_MONO \
125	125	assert(smpPtr >= base && smpPtr < base+v->end); \
126		− fSample = (smpPtr (1.0f / 32768.0f)) * fVolL; \
127		− *fMixBufferL++ += fSample; \
128		− *fMixBufferR++ += fSample; \
	126	+ dSample = (smpPtr (1.0 / 32768.0)) * dVolL; \
	127	+ *dMixBufferL++ += dSample; \
	128	+ *dMixBufferR++ += dSample; \
129	129
130	130	// 2-tap linear interpolation (like FT2)
131	131
132		−#define LINEAR_INTERPOLATION16(s, f) \
	132	+#define LINEAR_INTERPOLATION8(s, f) \
133	133	{ \
134		− const float fFrac = (const float)((uint32_t)f * (1.0f / (UINT32_MAX+1.0f))); /* 0.0 .. 0.999f */ \
135		− fSample = ((s[0] + (s[1]-s[0]) * fFrac)) * (1.0f / 32768.0f); \
	134	+ const double dFrac = (const double)((uint32_t)f * (1.0 / (UINT32_MAX+1.0))); /* 0.0 .. 0.999999999 */ \
	135	+ dSample = ((s[0] + (s[1]-s[0]) * dFrac)) * (1.0 / 128.0); \
136	136	} \
137	137
138		−#define LINEAR_INTERPOLATION8(s, f) \
	138	+#define LINEAR_INTERPOLATION16(s, f) \
139	139	{ \
140		− const float fFrac = (const float)((uint32_t)f * (1.0f / (UINT32_MAX+1.0f))); /* 0.0f .. 0.999f */ \
141		− fSample = ((s[0] + (s[1]-s[0]) * fFrac)) * (1.0f / 128.0f); \
	140	+ const double dFrac = (const double)((uint32_t)f * (1.0 / (UINT32_MAX+1.0))); /* 0.0 .. 0.999999999 */ \
	141	+ dSample = ((s[0] + (s[1]-s[0]) * dFrac)) * (1.0 / 32768.0); \
142	142	} \
143	143
144	144	#define RENDER_8BIT_SMP_LINTRP \
145	145	assert(smpPtr >= base && smpPtr < base+v->end); \
146	146	LINEAR_INTERPOLATION8(smpPtr, posFrac) \
147		− fMixBufferL++ += fSample fVolL; \
148		− fMixBufferR++ += fSample fVolR; \
	147	+ dMixBufferL++ += dSample dVolL; \
	148	+ dMixBufferR++ += dSample dVolR; \
149	149
150	150	#define RENDER_8BIT_SMP_MONO_LINTRP \
151	151	assert(smpPtr >= base && smpPtr < base+v->end); \
152	152	LINEAR_INTERPOLATION8(smpPtr, posFrac) \
153		− fSample *= fVolL; \
154		− *fMixBufferL++ += fSample; \
155		− *fMixBufferR++ += fSample; \
	153	+ dSample *= dVolL; \
	154	+ *dMixBufferL++ += dSample; \
	155	+ *dMixBufferR++ += dSample; \
156	156
157	157	#define RENDER_16BIT_SMP_LINTRP \
158	158	assert(smpPtr >= base && smpPtr < base+v->end); \
159	159	LINEAR_INTERPOLATION16(smpPtr, posFrac) \
160		− fMixBufferL++ += fSample fVolL; \
161		− fMixBufferR++ += fSample fVolR; \
	160	+ dMixBufferL++ += dSample dVolL; \
	161	+ dMixBufferR++ += dSample dVolR; \
162	162
163	163	#define RENDER_16BIT_SMP_MONO_LINTRP \
164	164	assert(smpPtr >= base && smpPtr < base+v->end); \
165	165	LINEAR_INTERPOLATION16(smpPtr, posFrac) \
166		− fSample *= fVolL; \
167		− *fMixBufferL++ += fSample; \
168		− *fMixBufferR++ += fSample; \
	166	+ dSample *= dVolL; \
	167	+ *dMixBufferL++ += dSample; \
	168	+ *dMixBufferR++ += dSample; \
169	169
170		−// 4-tap cubic spline interpolation (better quality, through LUT: mixer/ft2_cubicspline.c)
	170	+// 8-tap windowed-sinc interpolation (better quality, through LUT: mixer/ft2_windowed_sinc.c)
171	171
172	172	/* 8bitbubsy: It may look like we are potentially going out of bounds while looking up the sample points,
173	173	** but the sample data is actually padded on both the left (negative) and right side, where correct tap
@@ -177,85 +177,119 @@ · 3 unmodified lines
177	177	**
178	178	*/
179	179
180		−#define CUBICSPLINE_INTERPOLATION(LUT, s, f) \
	180	+#define WINDOWED_SINC_INTERPOLATION8(s, f) \
181	181	{ \
182		− const float t = (const float )LUT + (((uint32_t)f >> CUBIC_FSHIFT) & CUBIC_FMASK); \
183		− fSample = (s[-1] * t[0]) + (s[0] * t[1]) + (s[1] * t[2]) + (s[2] * t[3]); \
	182	+ const double *t = v->dSincLUT + (((uint32_t)f >> SINC_FSHIFT) & SINC_FMASK); \
	183	+ dSample = ((s[-3] * t[0]) + \
	184	+ (s[-2] * t[1]) + \
	185	+ (s[-1] * t[2]) + \
	186	+ ( s[0] * t[3]) + \
	187	+ ( s[1] * t[4]) + \
	188	+ ( s[2] * t[5]) + \
	189	+ ( s[3] * t[6]) + \
	190	+ ( s[4] * t[7])) * (1.0 / 128.0); \
184	191	} \
185	192
186		−#define CUBICSPLINE_INTERPOLATION_CUSTOM(LUT, f) \
	193	+#define WINDOWED_SINC_INTERPOLATION16(s, f) \
187	194	{ \
188		− const float t = (const float )LUT + (((uint32_t)f >> CUBIC_FSHIFT) & CUBIC_FMASK); \
189		− fSample = (s0 * t[0]) + (s1 * t[1]) + (s2 * t[2]) + (s3 * t[3]); \
	195	+ const double *t = v->dSincLUT + (((uint32_t)f >> SINC_FSHIFT) & SINC_FMASK); \
	196	+ dSample = ((s[-3] * t[0]) + \
	197	+ (s[-2] * t[1]) + \
	198	+ (s[-1] * t[2]) + \
	199	+ ( s[0] * t[3]) + \
	200	+ ( s[1] * t[4]) + \
	201	+ ( s[2] * t[5]) + \
	202	+ ( s[3] * t[6]) + \
	203	+ ( s[4] * t[7])) * (1.0 / 32768.0); \
190	204	} \
191	205
192		−#define RENDER_8BIT_SMP_CINTRP \
	206	+#define RENDER_8BIT_SMP_SINTRP \
193	207	assert(smpPtr >= base && smpPtr < base+v->end); \
194		− CUBICSPLINE_INTERPOLATION(fCubicSplineLUT8, smpPtr, posFrac) \
195		− fMixBufferL++ += fSample fVolL; \
196		− fMixBufferR++ += fSample fVolR; \
	208	+ WINDOWED_SINC_INTERPOLATION8(smpPtr, posFrac) \
	209	+ dMixBufferL++ += dSample dVolL; \
	210	+ dMixBufferR++ += dSample dVolR; \
197	211
198		−#define RENDER_8BIT_SMP_MONO_CINTRP \
	212	+#define RENDER_8BIT_SMP_MONO_SINTRP \
199	213	assert(smpPtr >= base && smpPtr < base+v->end); \
200		− CUBICSPLINE_INTERPOLATION(fCubicSplineLUT8, smpPtr, posFrac) \
201		− fSample *= fVolL; \
202		− *fMixBufferL++ += fSample; \
203		− *fMixBufferR++ += fSample; \
	214	+ WINDOWED_SINC_INTERPOLATION8(smpPtr, posFrac) \
	215	+ dSample *= dVolL; \
	216	+ *dMixBufferL++ += dSample; \
	217	+ *dMixBufferR++ += dSample; \
204	218
205		−#define RENDER_16BIT_SMP_CINTRP \
	219	+#define RENDER_16BIT_SMP_SINTRP \
206	220	assert(smpPtr >= base && smpPtr < base+v->end); \
207		− CUBICSPLINE_INTERPOLATION(fCubicSplineLUT16, smpPtr, posFrac) \
208		− fMixBufferL++ += fSample fVolL; \
209		− fMixBufferR++ += fSample fVolR; \
	221	+ WINDOWED_SINC_INTERPOLATION16(smpPtr, posFrac) \
	222	+ dMixBufferL++ += dSample dVolL; \
	223	+ dMixBufferR++ += dSample dVolR; \
210	224
211		−#define RENDER_16BIT_SMP_MONO_CINTRP \
	225	+#define RENDER_16BIT_SMP_MONO_SINTRP \
212	226	assert(smpPtr >= base && smpPtr < base+v->end); \
213		− CUBICSPLINE_INTERPOLATION(fCubicSplineLUT16, smpPtr, posFrac) \
214		− fSample *= fVolL; \
215		− *fMixBufferL++ += fSample; \
216		− *fMixBufferR++ += fSample; \
	227	+ WINDOWED_SINC_INTERPOLATION16(smpPtr, posFrac) \
	228	+ dSample *= dVolL; \
	229	+ *dMixBufferL++ += dSample; \
	230	+ *dMixBufferR++ += dSample; \
217	231
218		−#define RENDER_8BIT_SMP_CINTRP_TAP_FIX \
	232	+/* Special left-edge case mixers to get proper tap data after one loop cycle.
	233	+** These are only used with sinc interpolation on looped samples.
	234	+*/
	235	+
	236	+#define RENDER_8BIT_SMP_SINTRP_TAP_FIX \
219	237	assert(smpPtr >= base && smpPtr < base+v->end); \
220		− s0 = (smpPtr != loopStartPtr) ? smpPtr[-1] : fTapFixSample; \
221		− s1 = smpPtr[0]; \
222		− s2 = smpPtr[1]; \
223		− s3 = smpPtr[2]; \
224		− CUBICSPLINE_INTERPOLATION_CUSTOM(fCubicSplineLUT8, posFrac) \
225		− fMixBufferL++ += fSample fVolL; \
226		− fMixBufferR++ += fSample fVolR; \
227		−
228		−#define RENDER_8BIT_SMP_MONO_CINTRP_TAP_FIX \
	238	+ if (smpPtr <= leftEdgePtr) \
	239	+ { \
	240	+ const double *tapData = &v->dLeftEdgeTaps[(int32_t)(smpPtr - loopStartPtr)]; \
	241	+ WINDOWED_SINC_INTERPOLATION8(tapData, posFrac) \
	242	+ } \
	243	+ else \
	244	+ { \
	245	+ WINDOWED_SINC_INTERPOLATION8(smpPtr, posFrac) \
	246	+ } \
	247	+ dMixBufferL++ += dSample dVolL; \
	248	+ dMixBufferR++ += dSample dVolR; \
	249	+
	250	+#define RENDER_8BIT_SMP_MONO_SINTRP_TAP_FIX \
229	251	assert(smpPtr >= base && smpPtr < base+v->end); \
230		− s0 = (smpPtr != loopStartPtr) ? smpPtr[-1] : fTapFixSample; \
231		− s1 = smpPtr[0]; \
232		− s2 = smpPtr[1]; \
233		− s3 = smpPtr[2]; \
234		− CUBICSPLINE_INTERPOLATION_CUSTOM(fCubicSplineLUT8, posFrac) \
235		− fSample *= fVolL; \
236		− *fMixBufferL++ += fSample; \
237		− *fMixBufferR++ += fSample; \
238		−
239		−#define RENDER_16BIT_SMP_CINTRP_TAP_FIX \
	252	+ if (smpPtr <= leftEdgePtr) \
	253	+ { \
	254	+ const double *tapData = &v->dLeftEdgeTaps[(int32_t)(smpPtr - loopStartPtr)]; \
	255	+ WINDOWED_SINC_INTERPOLATION8(tapData, posFrac) \
	256	+ } \
	257	+ else \
	258	+ { \
	259	+ WINDOWED_SINC_INTERPOLATION8(smpPtr, posFrac) \
	260	+ } \
	261	+ dSample *= dVolL; \
	262	+ *dMixBufferL++ += dSample; \
	263	+ *dMixBufferR++ += dSample; \
	264	+
	265	+#define RENDER_16BIT_SMP_SINTRP_TAP_FIX \
240	266	assert(smpPtr >= base && smpPtr < base+v->end); \
241		− s0 = (smpPtr != loopStartPtr) ? smpPtr[-1] : fTapFixSample; \
242		− s1 = smpPtr[0]; \
243		− s2 = smpPtr[1]; \
244		− s3 = smpPtr[2]; \
245		− CUBICSPLINE_INTERPOLATION_CUSTOM(fCubicSplineLUT16, posFrac) \
246		− fMixBufferL++ += fSample fVolL; \
247		− fMixBufferR++ += fSample fVolR; \
248		−
249		−#define RENDER_16BIT_SMP_MONO_CINTRP_TAP_FIX \
	267	+ if (smpPtr <= leftEdgePtr) \
	268	+ { \
	269	+ const double *tapData = &v->dLeftEdgeTaps[(int32_t)(smpPtr - loopStartPtr)]; \
	270	+ WINDOWED_SINC_INTERPOLATION16(tapData, posFrac) \
	271	+ } \
	272	+ else \
	273	+ { \
	274	+ WINDOWED_SINC_INTERPOLATION16(smpPtr, posFrac) \
	275	+ } \
	276	+ dMixBufferL++ += dSample dVolL; \
	277	+ dMixBufferR++ += dSample dVolR; \
	278	+
	279	+#define RENDER_16BIT_SMP_MONO_SINTRP_TAP_FIX \
250	280	assert(smpPtr >= base && smpPtr < base+v->end); \
251		− s0 = (smpPtr != loopStartPtr) ? smpPtr[-1] : fTapFixSample; \
252		− s1 = smpPtr[0]; \
253		− s2 = smpPtr[1]; \
254		− s3 = smpPtr[2]; \
255		− CUBICSPLINE_INTERPOLATION_CUSTOM(fCubicSplineLUT16, posFrac) \
256		− fSample *= fVolL; \
257		− *fMixBufferL++ += fSample; \
258		− *fMixBufferR++ += fSample; \
	281	+ if (smpPtr <= leftEdgePtr) \
	282	+ { \
	283	+ const double *tapData = &v->dLeftEdgeTaps[(int32_t)(smpPtr - loopStartPtr)]; \
	284	+ WINDOWED_SINC_INTERPOLATION16(tapData, posFrac) \
	285	+ } \
	286	+ else \
	287	+ { \
	288	+ WINDOWED_SINC_INTERPOLATION16(smpPtr, posFrac) \
	289	+ } \
	290	+ dSample *= dVolL; \
	291	+ *dMixBufferL++ += dSample; \
	292	+ *dMixBufferR++ += dSample; \
259	293
260	294	/* ----------------------------------------------------------------------- */
261	295	/* SAMPLES-TO-MIX LIMITING MACROS */
@@ -267,6 +301,11 @@ · 5 unmodified lines
267	301	i = 65535; \
268	302	\
269	303	i = (i << 16) \| ((uint32_t)(posFrac >> 16) ^ 0xFFFF); \
	304	+ \
	305	+ /* This is hackish, but fast. This is sometimes off by one (-1), so */ \
	306	+ /* we need to do another cycle to reach the end of the sample. The */ \
	307	+ /* error is never +1, it's always below (safe). */ \
	308	+ \
270	309	samplesToMix = ((int64_t)i * v->revDelta) >> 32; \
271	310	samplesToMix++; \
272	311	\
@@ -295,8 +334,8 @@ · 22 unmodified lines
295	334	#define LIMIT_MIX_NUM_RAMP \
296	335	if (v->volRampSamples == 0) \
297	336	{ \
298		− fVolLDelta = 0; \
299		− fVolRDelta = 0; \
	337	+ dVolLDelta = 0.0; \
	338	+ dVolRDelta = 0.0; \
300	339	\
301	340	if (v->isFadeOutVoice) \
302	341	{ \
@@ -315,7 +354,7 @@ · 12 unmodified lines
315	354	#define LIMIT_MIX_NUM_MONO_RAMP \
316	355	if (v->volRampSamples == 0) \
317	356	{ \
318		− fVolLDelta = 0; \
	357	+ dVolLDelta = 0.0; \
319	358	if (v->isFadeOutVoice) \
320	359	{ \
321	360	v->active = false; /* volume ramp fadeout-voice is done, shut it down */ \

src/mixer/ft2_silence_mix.c+39−8

@@ -1,27 +1,58 @@
1	1	#include <stdint.h>
2	2	#include "../ft2_audio.h"
3		−#include "ft2_silence_mix.h"
	3	+
	4	+// used for the audio channel mixer when voice volume is zero
4	5
5	6	void silenceMixRoutine(voice_t *v, int32_t numSamples)
6	7	{
7		− int32_t pos;
8		− uint64_t posFrac;
	8	+ const uint64_t newPos = v->delta * (uint64_t)numSamples;
	9	+ const uint32_t addPos = (uint32_t)(newPos >> MIXER_FRAC_BITS);
	10	+ uint64_t addFrac = newPos & MIXER_FRAC_MASK;
	11	+
	12	+ addFrac += v->posFrac;
	13	+ int32_t pos = v->pos + addPos + (uint32_t)(addFrac >> MIXER_FRAC_BITS);
	14	+ uint64_t posFrac = addFrac & MIXER_FRAC_MASK;
9	15
10		− SILENCE_MIX_INC_POS
	16	+ if (pos < v->end) // we haven't reached the sample's end yet
	17	+ {
	18	+ v->posFrac = posFrac;
	19	+ v->pos = pos;
	20	+ return;
	21	+ }
	22	+
	23	+ // end of sample (or loop) reached
11	24
12	25	if (v->loopType == LOOP_DISABLED)
13	26	{
14		− SILENCE_MIX_NO_LOOP
	27	+ v->active = false; // shut down voice
	28	+ return;
15	29	}
16		− else if (v->loopType == LOOP_FORWARD)
	30	+
	31	+ if (v->loopType == LOOP_FORWARD)
17	32	{
18		− SILENCE_MIX_LOOP
	33	+ if (v->loopLength >= 2)
	34	+ pos = v->loopStart + ((pos - v->end) % v->loopLength);
	35	+ else
	36	+ pos = v->loopStart;
19	37	}
20	38	else // pingpong loop
21	39	{
22		− SILENCE_MIX_BIDI_LOOP
	40	+ if (v->loopLength >= 2)
	41	+ {
	42	+ const int32_t overflow = pos - v->end;
	43	+ const int32_t cycles = overflow / v->loopLength;
	44	+ const int32_t phase = overflow % v->loopLength;
	45	+
	46	+ pos = v->loopStart + phase;
	47	+ v->backwards ^= !(cycles & 1);
	48	+ }
	49	+ else
	50	+ {
	51	+ pos = v->loopStart;
	52	+ }
23	53	}
24	54
	55	+ v->hasLooped = true;
25	56	v->posFrac = posFrac;
26	57	v->pos = pos;
27	58	}

src/mixer/ft2_silence_mix.h+0−47

@@ -1,53 +1,6 @@
1	1	#pragma once
2	2
3	3	#include <stdint.h>
4		−#include <assert.h>
5	4	#include "../ft2_audio.h"
6	5
7		−#define SILENCE_MIX_NO_LOOP \
8		− if (pos >= v->end) \
9		− { \
10		− v->active = false; /* shut down voice */ \
11		− return; \
12		− } \
13		−
14		−#define SILENCE_MIX_INC_POS \
15		− const uint64_t newPos = v->delta * (uint64_t)numSamples; \
16		− const uint32_t addPos = (uint32_t)(newPos >> MIXER_FRAC_BITS); \
17		− uint64_t addFrac = newPos & MIXER_FRAC_MASK; \
18		− \
19		− addFrac += v->posFrac; \
20		− pos = v->pos + addPos + (uint32_t)(addFrac >> MIXER_FRAC_BITS); \
21		− posFrac = addFrac & MIXER_FRAC_MASK; \
22		−
23		−#define SILENCE_MIX_LOOP \
24		− if (pos >= v->end) \
25		− { \
26		− if (v->loopLength >= 2) \
27		− pos = v->loopStart + ((pos - v->end) % v->loopLength); \
28		− else \
29		− pos = v->loopStart; \
30		− \
31		− v->hasLooped = true; \
32		− } \
33		−
34		−#define SILENCE_MIX_BIDI_LOOP \
35		− if (pos >= v->end) \
36		− { \
37		− if (v->loopLength >= 2) \
38		− { \
39		− const int32_t overflow = pos - v->end; \
40		− const int32_t cycles = overflow / v->loopLength; \
41		− const int32_t phase = overflow % v->loopLength; \
42		− \
43		− pos = v->loopStart + phase; \
44		− v->backwards ^= !(cycles & 1); \
45		− } \
46		− else \
47		− { \
48		− pos = v->loopStart; \
49		− } \
50		− v->hasLooped = true; \
51		− } \
52		−
53	6	void silenceMixRoutine(voice_t *v, int32_t numSamples);

src/mixer/ft2_windowed_sinc.c+99−0

@@ -0,0 +1,99 @@
	1	+#include <stdint.h>
	2	+#include <stdbool.h>
	3	+#include <stdlib.h>
	4	+#include <math.h>
	5	+#include "ft2_windowed_sinc.h"
	6	+
	7	+// globalized
	8	+double *gKaiserSinc = NULL;
	9	+double *gDownSample1 = NULL;
	10	+double *gDownSample2 = NULL;
	11	+
	12	+/* Code taken from the OpenMPT project, which has a BSD
	13	+** license which is compatible with this this project.
	14	+**
	15	+** The code has been slightly modified.
	16	+*/
	17	+
	18	+static double Izero(double y) // Compute Bessel function Izero(y) using a series approximation
	19	+{
	20	+ double s = 1.0, ds = 1.0, d = 0.0;
	21	+
	22	+ const double epsilon = 1E-9; // 8bb: 1E-7 -> 1E-9 for added precision (still fast to calculate)
	23	+
	24	+ do
	25	+ {
	26	+ d = d + 2.0;
	27	+ ds = ds * (y * y) / (d * d);
	28	+ s = s + ds;
	29	+ }
	30	+ while (ds > epsilon * s);
	31	+
	32	+ return s;
	33	+}
	34	+
	35	+static void getSinc(double *dLUTPtr, const double beta, const double cutoff)
	36	+{
	37	+ const double izeroBeta = Izero(beta);
	38	+ const double kPi = 4.0 * atan(1.0) * cutoff; // M_PI can't be trusted
	39	+
	40	+ for (int32_t i = 0; i < SINC_LUT_LEN; i++)
	41	+ {
	42	+ double dSinc;
	43	+ int32_t ix = (SINC_TAPS-1) - (i & (SINC_TAPS-1));
	44	+
	45	+ ix = (ix * SINC_PHASES) + (i >> SINC_TAPS_BITS);
	46	+ if (ix == SINC_MID_TAP)
	47	+ {
	48	+ dSinc = 1.0;
	49	+ }
	50	+ else
	51	+ {
	52	+ const double x = (ix - SINC_MID_TAP) * (1.0 / SINC_PHASES);
	53	+ const double xPi = x * kPi;
	54	+
	55	+ const double xMul = 1.0 / ((SINC_TAPS/2) * (SINC_TAPS/2));
	56	+ dSinc = sin(xPi) * Izero(beta * sqrt(1.0 - x * x * xMul)) / (izeroBeta * xPi); // Kaiser window
	57	+ }
	58	+
	59	+ dLUTPtr[i] = dSinc * cutoff;
	60	+ }
	61	+}
	62	+
	63	+bool calcWindowedSincTables(void)
	64	+{
	65	+ gKaiserSinc = (double )malloc(SINC_LUT_LEN sizeof (double));
	66	+ gDownSample1 = (double )malloc(SINC_LUT_LEN sizeof (double));
	67	+ gDownSample2 = (double )malloc(SINC_LUT_LEN sizeof (double));
	68	+
	69	+ if (gKaiserSinc == NULL \|\| gDownSample1 == NULL \|\| gDownSample2 == NULL)
	70	+ return false;
	71	+
	72	+ // OpenMPT parameters
	73	+ getSinc(gKaiserSinc, 9.6377, 0.97);
	74	+ getSinc(gDownSample1, 8.5, 0.5);
	75	+ getSinc(gDownSample2, 2.7625, 0.425);
	76	+
	77	+ return true;
	78	+}
	79	+
	80	+void freeWindowedSincTables(void)
	81	+{
	82	+ if (gKaiserSinc != NULL)
	83	+ {
	84	+ free(gKaiserSinc);
	85	+ gKaiserSinc = NULL;
	86	+ }
	87	+
	88	+ if (gDownSample1 != NULL)
	89	+ {
	90	+ free(gDownSample1);
	91	+ gDownSample1 = NULL;
	92	+ }
	93	+
	94	+ if (gDownSample2 != NULL)
	95	+ {
	96	+ free(gDownSample2);
	97	+ gDownSample2 = NULL;
	98	+ }
	99	+}

src/mixer/ft2_windowed_sinc.h+33−0

@@ -0,0 +1,33 @@
	1	+#pragma once
	2	+
	3	+#include <stdint.h>
	4	+#include <stdbool.h>
	5	+
	6	+#ifndef MIXER_FRAC_BITS
	7	+#define MIXER_FRAC_BITS 32
	8	+#endif
	9	+
	10	+// if you change this, also change SINC_PHASES_BITS (>4096 makes little sense)
	11	+#define SINC_PHASES 4096
	12	+#define SINC_PHASES_BITS 12 /* log2(SINC_PHASES) */
	13	+
	14	+// don't change these!
	15	+
	16	+#define SINC_TAPS 8
	17	+#define SINC_TAPS_BITS 3
	18	+#define SINC_LUT_LEN (SINC_TAPS * SINC_PHASES)
	19	+#define SINC_FSHIFT (MIXER_FRAC_BITS-(SINC_PHASES_BITS+SINC_TAPS_BITS))
	20	+#define SINC_FMASK ((SINC_TAPS*SINC_PHASES)-SINC_TAPS)
	21	+
	22	+#define SINC_LEFT_TAPS ((SINC_TAPS/2)-1)
	23	+#define SINC_RIGHT_TAPS (SINC_TAPS/2)
	24	+
	25	+// for LUT calculation
	26	+#define SINC_MID_TAP ((SINC_TAPS/2)*SINC_PHASES)
	27	+
	28	+extern double *gKaiserSinc;
	29	+extern double *gDownSample1;
	30	+extern double *gDownSample2;
	31	+
	32	+bool calcWindowedSincTables(void);
	33	+void freeWindowedSincTables(void);

Pushed v1.37 code

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code