Push v1.33 code

8bitbubsy · Sep 4, 2021 · b8e8e8a · b8e8e8a
1 parent 67803a8
commit b8e8e8a
Show file tree

Hide file tree

Showing 21 changed files with 729 additions and 430 deletions.
diff --git a/src/pt2_audio.c b/src/pt2_audio.c
diff --git a/src/pt2_audio.h b/src/pt2_audio.h
@@ -8,11 +8,11 @@ typedef struct audio_t
 {
 	volatile bool locked, isSampling;
 
-	bool forceMixerOff;
+	bool forceSoundCardSilence;
 
 	uint32_t outputRate, audioBufferSize;
 	int64_t tickSampleCounter64, samplesPerTick64;
-	int64_t bpmTable[256-32], bpmTable28kHz[256-32], bpmTable22kHz[256-32], bpmTableMod2Wav[256-32]; // 32.32 fixed-point
+	int64_t bpmTable[256-32], bpmTable28kHz[256-32], bpmTable20kHz[256-32]; // 32.32 fixed-point
 	double dPeriodToDeltaDiv;
 
 	// for audio sampling
@@ -29,7 +29,7 @@ typedef struct voice_t
 
 	const int8_t *data, *newData;
 	int32_t length, newLength, pos;
-	double dVolume, dDelta, dDeltaMul, dPhase, dLastDelta, dLastDeltaMul, dLastPhase, dPanL, dPanR;
+	double dVolume, dDelta, dDeltaMul, dPhase, dLastDelta, dLastDeltaMul, dLastPhase;
 
 	// period cache
 	int32_t oldPeriod;
@@ -58,7 +58,6 @@ void normalize32BitTo8Bit(int32_t *sampleData, uint32_t sampleLength);
 void normalizeFloatTo8Bit(float *fSampleData, uint32_t sampleLength);
 void normalizeDoubleTo8Bit(double *dSampleData, uint32_t sampleLength);
 
-void recalcFilterCoeffs(int32_t outputRate); // for MOD2WAV
 void setLEDFilter(bool state, bool doLockAudio);
 void toggleLEDFilter(void);
 void toggleAmigaPanMode(void);
@@ -74,9 +73,8 @@ void unlockAudio(void);
 void mixerUpdateLoops(void);
 void mixerKillVoice(int32_t ch);
 void turnOffVoices(void);
-void mixerCalcVoicePans(uint8_t stereoSeparation);
+void mixerSetStereoSeparation(uint8_t percentage);
 void outputAudio(int16_t *target, int32_t numSamples);
-void resetAudioDownsamplingStates(void);
 
 extern audio_t audio; // pt2_audio.c
 extern paulaVoice_t paula[AMIGA_VOICES]; // pt2_audio.c
diff --git a/src/pt2_chordmaker.c b/src/pt2_chordmaker.c
@@ -164,7 +164,7 @@ void mixChordSample(void)
 	s->text[21] = '!'; // chord sample indicator
 	s->text[22] = '\0';
 
-	memset(mixCh, 0, sizeof (mixCh));
+	memset(mixCh, 0, sizeof (mixCh)); // also clears position and frac
 
 	// setup mixing lengths and deltas