Apple-2-Tools/Steve2
1
0
Fork 0
mirror of https://github.com/trudnai/Steve2.git synced 2026-04-26 04:18:06 +00:00
Code Issues Projects Releases Wiki Activity

Better sound quality on PWM style games like Wavy Navy and Xonix

Browse Source
This commit is contained in:
tudnai
2021-05-17 11:36:24 -07:00
parent 1bac3a26af
commit 85a08ad468
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dev/audio/speaker.c
+16 -8
View File
@@ -373,7 +373,7 @@ void spkr_toggle() {
// (we will play the entire buffer at the end of the frame)
spkr_sample_idx = ( (spkr_clk + m6502.clkfrm) / ( MHZ(default_MHz_6502) / spkr_sample_rate)) * SPKR_CHANNELS;
unsigned spkr_sample_idx_diff = spkr_sample_idx - spkr_sample_last_idx;
spkr_level = spkr_samples[ spkr_sample_idx ];
if ( spkr_state ) {
@@ -386,11 +386,15 @@ void spkr_toggle() {
if ( spkr_sample_idx_diff < 8 ) {
// printf("sd:%u\n", spkr_sample_idx_diff);
float new_level = SPKR_LEVEL_MIN + dumping;
spkr_sample_t last_level = spkr_samples[spkr_sample_last_idx];
float new_level = SPKR_LEVEL_MIN + dumping;
last_level += new_level;
last_level /= 2;
float dumping = last_level - SPKR_LEVEL_MIN;
dumping *= SPKR_INITIAL_TRAILING_EDGE;
while ( spkr_sample_last_idx < spkr_sample_idx ) {
last_level += new_level;
last_level /= 2;
spkr_samples[ spkr_sample_last_idx++ ] = last_level;
spkr_samples[ spkr_sample_last_idx++ ] = last_level; // stereo
}
@@ -420,12 +424,16 @@ void spkr_toggle() {
if ( spkr_sample_idx_diff < 8 ) {
// printf("sd:%u\n", spkr_sample_idx_diff);
float new_level = SPKR_LEVEL_MAX + dumping;
spkr_sample_t last_level = spkr_samples[spkr_sample_last_idx];
float new_level = SPKR_LEVEL_MAX + dumping;
last_level += new_level;
last_level /= 2;
float dumping = last_level - SPKR_LEVEL_MIN;
dumping *= SPKR_INITIAL_TRAILING_EDGE;
while ( spkr_sample_last_idx < spkr_sample_idx ) {
last_level += new_level;
last_level /= 2;
spkr_samples[ spkr_sample_last_idx++ ] = last_level;
spkr_samples[ spkr_sample_last_idx++ ] = last_level; // stereo
}
src/dev/audio/speaker.h
+3 -3
View File
@@ -50,10 +50,10 @@
//#define SPKR_LEVEL_MAX (+1000)
#define SPKR_FADE_LEADING_EDGE 0.40
#define SPKR_FADE_LEADING_EDGE 0.32
#define SPKR_FADE_TRAILING_EDGE 0.16
#define SPKR_INITIAL_LEADING_EDGE 1.00 // leading edge should be pretty steep to get sharp sound plus to avoid Wavy Navy high pitch sound
#define SPKR_INITIAL_TRAILING_EDGE 0.88 // need a bit of slope to get Xonix sound good
#define SPKR_INITIAL_LEADING_EDGE 0.96 // leading edge should be pretty steep to get sharp sound plus to avoid Wavy Navy high pitch sound
#define SPKR_INITIAL_TRAILING_EDGE 0.72 // need a bit of slope to get Xonix sound good