libretro/FBNeo
1
0
Fork 0
mirror of https://github.com/libretro/FBNeo.git synced 2025-01-09 10:20:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snd/pokey: per-chip volume

Browse Source
This commit is contained in:
dinkc64 2018-09-30 22:45:55 +00:00
parent 6eb7926b91
commit 9ad3e1063b
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/burn/snd/pokey.cpp
View File

@ -57,7 +57,6 @@
* I use 15/11 = 1.3636, so this is a little lower. * I use 15/11 = 1.3636, so this is a little lower.
*/ */
#define POKEY_DEFAULT_GAIN (32767/11/4) #define POKEY_DEFAULT_GAIN (32767/11/4)
static double pokey_mastervol = 1.0;
static INT32 nLeftSample = 0, nRightSample = 0; static INT32 nLeftSample = 0, nRightSample = 0;
#define VERBOSE 0 #define VERBOSE 0
@ -198,7 +197,8 @@ struct POKEYregisters {
INT32 (*allpot_r)(INT32 offs); INT32 (*allpot_r)(INT32 offs);
INT32 (*serin_r)(INT32 offs); INT32 (*serin_r)(INT32 offs);
void (*serout_w)(INT32 offs, INT32 data); void (*serout_w)(INT32 offs, INT32 data);
INT32 OutputDir; INT32 OutputDir; // routing of chip
double ChipVol; // volume of chip
UINT32 samplerate_24_8; /* sample rate in 24.8 format */ UINT32 samplerate_24_8; /* sample rate in 24.8 format */
}; };
@ -359,8 +359,8 @@ static UINT8 *rand17;
pokey[chip].samplepos_fract &= 0x000000ff; \ pokey[chip].samplepos_fract &= 0x000000ff; \
} \ } \
/* store sum of output signals into the buffer */ \ /* store sum of output signals into the buffer */ \
nLeftSample = ((pokey[chip].OutputDir & BURN_SND_ROUTE_LEFT ) == BURN_SND_ROUTE_LEFT ) ? BURN_SND_CLIP((INT32)(sum * pokey_mastervol)) : 0; \ nLeftSample = ((pokey[chip].OutputDir & BURN_SND_ROUTE_LEFT ) == BURN_SND_ROUTE_LEFT ) ? BURN_SND_CLIP((INT32)(sum * pokey[chip].ChipVol)) : 0; \
nRightSample = ((pokey[chip].OutputDir & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) ? BURN_SND_CLIP((INT32)(sum * pokey_mastervol)) : 0; \ nRightSample = ((pokey[chip].OutputDir & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) ? BURN_SND_CLIP((INT32)(sum * pokey[chip].ChipVol)) : 0; \
buffer[0] = BURN_SND_CLIP(buffer[0] + nLeftSample); \ buffer[0] = BURN_SND_CLIP(buffer[0] + nLeftSample); \
buffer[1] = BURN_SND_CLIP(buffer[1] + nRightSample); \ buffer[1] = BURN_SND_CLIP(buffer[1] + nRightSample); \
buffer++; buffer++; \ buffer++; buffer++; \
@ -621,11 +621,12 @@ void PokeyAllPotCallback(INT32 chip, INT32 (*pot_cb)(INT32 offs))
p->allpot_r = pot_cb; p->allpot_r = pot_cb;
} }
void PokeySetRoute(INT32 chip, INT32 nRouteDir) void PokeySetRoute(INT32 chip, double chipvol, INT32 nRouteDir)
{ {
struct POKEYregisters *p = &pokey[chip]; struct POKEYregisters *p = &pokey[chip];
p->OutputDir = nRouteDir; p->OutputDir = nRouteDir;
p->ChipVol = chipvol;
} }
void PokeyPotCallback(INT32 chip, INT32 potnum, INT32 (*pot_cb)(INT32 offs)) void PokeyPotCallback(INT32 chip, INT32 potnum, INT32 (*pot_cb)(INT32 offs))
@ -663,7 +664,7 @@ INT32 PokeyInit(INT32 clock, INT32 num, double vol, INT32 addtostream)
sample_rate = nBurnSoundRate; sample_rate = nBurnSoundRate;
intf.num = num; intf.num = num;
//intf.mixing_level[0] = vol; //intf.mixing_level[0] = vol;
pokey_mastervol = vol; //pokey_mastervol = vol;
intf.baseclock = (clock) ? clock : FREQ_17_EXACT; intf.baseclock = (clock) ? clock : FREQ_17_EXACT;
intf.addtostream = addtostream; intf.addtostream = addtostream;
@ -705,6 +706,7 @@ INT32 PokeyInit(INT32 clock, INT32 num, double vol, INT32 addtostream)
p->rtimer = 0; //timer_set(TIME_NEVER, chip, NULL); p->rtimer = 0; //timer_set(TIME_NEVER, chip, NULL);
p->OutputDir = BURN_SND_ROUTE_BOTH; // default routing p->OutputDir = BURN_SND_ROUTE_BOTH; // default routing
p->ChipVol = vol;
#if 0 #if 0
memset(p->potgo_timer, 0, sizeof(p->potgo_timer)); memset(p->potgo_timer, 0, sizeof(p->potgo_timer));

2
src/burn/snd/pokey.h
View File

@ -96,7 +96,7 @@ struct POKEYinterface {
INT32 PokeyInit(INT32 clock, INT32 num, double vol, INT32 addtostream); INT32 PokeyInit(INT32 clock, INT32 num, double vol, INT32 addtostream);
void PokeyExit(); void PokeyExit();
void PokeyReset(); void PokeyReset();
void PokeySetRoute(INT32 chip, INT32 nRouteDir); void PokeySetRoute(INT32 chip, double chipvol, INT32 nRouteDir);
void PokeySetTotalCyclesCB(INT32 (*pCPUCyclesCB)()); // see pre90s/d_tempest.cpp void PokeySetTotalCyclesCB(INT32 (*pCPUCyclesCB)()); // see pre90s/d_tempest.cpp