mirror of
https://github.com/Pecusx/libretro-atari800.git
synced 2026-05-21 14:49:36 +02:00
Revert "sound: fix faint sound buzzing (from https://github.com/atari800/atari800/commit/43fa9)"
This reverts commit da7893488b.
This commit is contained in:
+16
-16
@@ -2341,16 +2341,16 @@ static void mzpokeysnd_process_8(void* sndbuffer, int sndn)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef VOL_ONLY_SOUND
|
#ifdef VOL_ONLY_SOUND
|
||||||
buffer[0] = (UBYTE)floor((generate_sample(pokey_states) + POKEYSND_sampout)
|
buffer[0] = (UBYTE)floor((generate_sample(pokey_states) + POKEYSND_sampout - MAX_SAMPLE / 2.0)
|
||||||
* (255.0 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95) + 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
* (255.0 / MAX_SAMPLE / 4 * M_PI * 0.95) + 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
||||||
#else
|
#else
|
||||||
buffer[0] = (UBYTE)floor(generate_sample(pokey_states)
|
buffer[0] = (UBYTE)floor((generate_sample(pokey_states) - MAX_SAMPLE / 2.0)
|
||||||
* (255.0 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95) + 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
* (255.0 / MAX_SAMPLE / 4 * M_PI * 0.95) + 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
||||||
#endif
|
#endif
|
||||||
for(i=1; i<num_cur_pokeys; i++)
|
for(i=1; i<num_cur_pokeys; i++)
|
||||||
{
|
{
|
||||||
buffer[i] = (UBYTE)floor(generate_sample(pokey_states + i)
|
buffer[i] = (UBYTE)floor((generate_sample(pokey_states + i) - MAX_SAMPLE / 2.0)
|
||||||
* (255.0 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95) + 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
* (255.0 / MAX_SAMPLE / 4 * M_PI * 0.95) + 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
||||||
}
|
}
|
||||||
buffer += num_cur_pokeys;
|
buffer += num_cur_pokeys;
|
||||||
nsam -= num_cur_pokeys;
|
nsam -= num_cur_pokeys;
|
||||||
@@ -2389,16 +2389,16 @@ static void mzpokeysnd_process_16(void* sndbuffer, int sndn)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef VOL_ONLY_SOUND
|
#ifdef VOL_ONLY_SOUND
|
||||||
buffer[0] = (SWORD)floor((generate_sample(pokey_states) + POKEYSND_sampout)
|
buffer[0] = (SWORD)floor((generate_sample(pokey_states) + POKEYSND_sampout - MAX_SAMPLE / 2.0)
|
||||||
* (65535.0 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95) + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
* (65535.0 / MAX_SAMPLE / 4 * M_PI * 0.95) + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
||||||
#else
|
#else
|
||||||
buffer[0] = (SWORD)floor(generate_sample(pokey_states)
|
buffer[0] = (SWORD)floor((generate_sample(pokey_states) - MAX_SAMPLE / 2.0)
|
||||||
* (65535.0 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95) + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
* (65535.0 / MAX_SAMPLE / 4 * M_PI * 0.95) + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
||||||
#endif
|
#endif
|
||||||
for(i=1; i<num_cur_pokeys; i++)
|
for(i=1; i<num_cur_pokeys; i++)
|
||||||
{
|
{
|
||||||
buffer[i] = (SWORD)floor(generate_sample(pokey_states + i)
|
buffer[i] = (SWORD)floor((generate_sample(pokey_states + i) - MAX_SAMPLE / 2.0)
|
||||||
* (65535.0 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95) + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
* (65535.0 / MAX_SAMPLE / 4 * M_PI * 0.95) + 0.5 + 0.5 * rand() / RAND_MAX - 0.25);
|
||||||
}
|
}
|
||||||
buffer += num_cur_pokeys;
|
buffer += num_cur_pokeys;
|
||||||
nsam -= num_cur_pokeys;
|
nsam -= num_cur_pokeys;
|
||||||
@@ -2434,16 +2434,16 @@ static void generate_sync(unsigned int num_ticks)
|
|||||||
advance_ticks(pokey_states + i, ticks);
|
advance_ticks(pokey_states + i, ticks);
|
||||||
if (POKEYSND_snd_flags & POKEYSND_BIT16) {
|
if (POKEYSND_snd_flags & POKEYSND_BIT16) {
|
||||||
*((SWORD *)buffer) = (SWORD)floor(
|
*((SWORD *)buffer) = (SWORD)floor(
|
||||||
interp_read_resam_all(pokey_states + i, samp_pos)
|
(interp_read_resam_all(pokey_states + i, samp_pos) - MAX_SAMPLE / 2.0)
|
||||||
* (volume.s16 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95)
|
* (65535.0 / MAX_SAMPLE / 4 * M_PI * 0.95)
|
||||||
+ 0.5 + 0.5 * rand() / RAND_MAX - 0.25
|
+ 0.5 + 0.5 * rand() / RAND_MAX - 0.25
|
||||||
);
|
);
|
||||||
buffer += 2;
|
buffer += 2;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
*buffer++ = (UBYTE)floor(
|
*buffer++ = (UBYTE)floor(
|
||||||
interp_read_resam_all(pokey_states + i, samp_pos)
|
(interp_read_resam_all(pokey_states + i, samp_pos) - MAX_SAMPLE / 2.0)
|
||||||
* (volume.s8 / 2 / MAX_SAMPLE / 4 * M_PI * 0.95)
|
* (255.0 / MAX_SAMPLE / 4 * M_PI * 0.95)
|
||||||
+ 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25
|
+ 128 + 0.5 + 0.5 * rand() / RAND_MAX - 0.25
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user