From 6ed58ab3da90a6987bf3b8d51c7db27ed1513460 Mon Sep 17 00:00:00 2001 From: Michael Pavone Date: Tue, 11 Feb 2014 12:52:28 -0800 Subject: Adjust PSG and YM-2612 volume to be closer to the real console --- psg.c | 2 +- ym2612.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/psg.c b/psg.c index cb5e8ce..083d7d5 100644 --- a/psg.c +++ b/psg.c @@ -74,7 +74,7 @@ void psg_write(psg_context * context, uint8_t value) } } -#define PSG_VOL_DIV 6 +#define PSG_VOL_DIV 14 //table shamelessly swiped from PSG doc from smspower.org int16_t volume_table[16] = { diff --git a/ym2612.c b/ym2612.c index feb3a18..4943cee 100644 --- a/ym2612.c +++ b/ym2612.c @@ -232,7 +232,8 @@ void ym_init(ym2612_context * context, uint32_t sample_rate, uint32_t master_clo } } -#define YM_VOLUME_DIVIDER 2 +#define YM_VOLUME_MULTIPLIER 2 +#define YM_VOLUME_DIVIDER 3 #define YM_MOD_SHIFT 1 #define TIMER_A_MAX 1023 @@ -455,7 +456,7 @@ void ym_run(ym2612_context * context, uint32_t to_cycle) if (value & 0x2000) { value |= 0xC000; } - dfprintf(debug_file, "channel %d output: %d\n", channel, value / YM_VOLUME_DIVIDER); + dfprintf(debug_file, "channel %d output: %d\n", channel, (value * YM_VOLUME_MULTIPLIER) / YM_VOLUME_DIVIDER); } } //puts("operator update done"); @@ -485,10 +486,10 @@ void ym_run(ym2612_context * context, uint32_t to_cycle) fwrite(&value, sizeof(value), 1, context->channels[i].logfile); } if (context->channels[i].lr & 0x80) { - context->audio_buffer[context->buffer_pos] += value / YM_VOLUME_DIVIDER; + context->audio_buffer[context->buffer_pos] += (value * YM_VOLUME_MULTIPLIER) / YM_VOLUME_DIVIDER; } if (context->channels[i].lr & 0x40) { - context->audio_buffer[context->buffer_pos+1] += value / YM_VOLUME_DIVIDER; + context->audio_buffer[context->buffer_pos+1] += (value * YM_VOLUME_MULTIPLIER) / YM_VOLUME_DIVIDER; } } context->buffer_pos += 2; -- cgit v1.2.3