Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

aica.c: ADPCM looping (DC swirl sound) and address masking (Red Dog) fixes [MetalliC, Wind]

Browse source
This commit is contained in:
MetalliC 2015-03-25 21:32:06 +02:00
parent 71a4103cc6
commit 978708879d
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/emu/sound/aica.c
View file

@ -1079,10 +1079,14 @@ INT32 aica_device::UpdateSlot(AICA_SLOT *slot)
UINT32 addr1,addr2,addr_select; // current and next sample addresses UINT32 addr1,addr2,addr_select; // current and next sample addresses
UINT32 *addr[2] = {&addr1, &addr2}; // used for linear interpolation UINT32 *addr[2] = {&addr1, &addr2}; // used for linear interpolation
UINT32 *slot_addr[2] = {&(slot->cur_addr), &(slot->nxt_addr)}; // UINT32 *slot_addr[2] = {&(slot->cur_addr), &(slot->nxt_addr)}; //
UINT32 chanlea = LEA(slot);
if(SSCTL(slot)!=0) //no FM or noise yet if(SSCTL(slot)!=0) //no FM or noise yet
return 0; return 0;
if(PCMS(slot) == 3) // Red Dog music relies on this
chanlea = (chanlea + 3) & ~3;
if(PLFOS(slot)!=0) if(PLFOS(slot)!=0)
{ {
step=step*AICAPLFO_Step(&(slot->PLFO)); step=step*AICAPLFO_Step(&(slot->PLFO));
@ -1130,7 +1134,7 @@ INT32 aica_device::UpdateSlot(AICA_SLOT *slot)
int cur_sample; //current ADPCM sample int cur_sample; //current ADPCM sample
int nxt_sample; //next ADPCM sample int nxt_sample; //next ADPCM sample
INT32 fpart=slot->cur_addr&((1<<SHIFT)-1); INT32 fpart=slot->cur_addr&((1<<SHIFT)-1);
UINT32 steps_to_go = addr2, curstep = slot->curstep; UINT32 steps_to_go = addr1 > addr2 ? chanlea : addr2, curstep = slot->curstep;
if (slot->adbase) if (slot->adbase)
{ {
@ -1186,19 +1190,19 @@ INT32 aica_device::UpdateSlot(AICA_SLOT *slot)
switch(LPCTL(slot)) switch(LPCTL(slot))
{ {
case 0: //no loop case 0: //no loop
if(*addr[addr_select]>=LSA(slot) && *addr[addr_select]>=LEA(slot)) if(*addr[addr_select]>=LSA(slot) && *addr[addr_select]>=chanlea)
{ {
StopSlot(slot,0); StopSlot(slot,0);
} }
break; break;
case 1: //normal loop case 1: //normal loop
if(*addr[addr_select]>=LEA(slot)) if(*addr[addr_select]>=chanlea)
{ {
slot->lpend = 1; slot->lpend = 1;
rem_addr = *slot_addr[addr_select] - (LEA(slot)<<SHIFT); rem_addr = *slot_addr[addr_select] - (chanlea<<SHIFT);
*slot_addr[addr_select]=(LSA(slot)<<SHIFT) + rem_addr; *slot_addr[addr_select]=(LSA(slot)<<SHIFT) + rem_addr;
if(PCMS(slot)>=2) if(PCMS(slot)>=2 && addr_select == 0)
{ {
// restore the state @ LSA - the sampler will naturally walk to (LSA + remainder) // restore the state @ LSA - the sampler will naturally walk to (LSA + remainder)
slot->adbase = &m_AICARAM[SA(slot)+(LSA(slot)/2)]; slot->adbase = &m_AICARAM[SA(slot)+(LSA(slot)/2)];