ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove BurnYM2610SetSoundMixMode(), update drivers as necessary

This commit is contained in:
Barry Harris 2012-05-15 16:05:59 +00:00
parent cbc1a489da
commit 0140077837
8 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/burn/drv/pst90s/d_welltris.cpp
View File

@ -588,7 +588,9 @@ static INT32 DrvInit()
BurnYM2610Init(8000000, DrvSndROM1, &DrvSndROMLen1, DrvSndROM0, &DrvSndROMLen0, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0); BurnYM2610Init(8000000, DrvSndROM1, &DrvSndROMLen1, DrvSndROM0, &DrvSndROMLen0, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0);
BurnTimerAttachZet(4000000); BurnTimerAttachZet(4000000);
BurnYM2610SetSoundMixMode(1); BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 0.75, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 0.75, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
GenericTilesInit(); GenericTilesInit();
@ -601,7 +603,6 @@ static INT32 DrvExit()
{ {
GenericTilesExit(); GenericTilesExit();
BurnYM2610SetSoundMixMode(0);
BurnYM2610Exit(); BurnYM2610Exit();
ZetExit(); ZetExit();

4
src/burn/drv/taito/d_asuka.cpp
View File

@ -1334,7 +1334,9 @@ static void BonzeSoundSetup()
INT32 DrvSndROMLen = 0x80000; INT32 DrvSndROMLen = 0x80000;
BurnYM2610Init(8000000, TaitoYM2610ARom, &DrvSndROMLen, TaitoYM2610ARom, &DrvSndROMLen, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0); BurnYM2610Init(8000000, TaitoYM2610ARom, &DrvSndROMLen, TaitoYM2610ARom, &DrvSndROMLen, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0);
BurnTimerAttachZet(4000000); BurnTimerAttachZet(4000000);
BurnYM2610SetSoundMixMode(1); BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
TaitoNumYM2151 = 0; TaitoNumYM2151 = 0;
TaitoNumYM2610 = 1; TaitoNumYM2610 = 1;

14
src/burn/drv/taito/d_darius2.cpp
View File

@ -1412,7 +1412,9 @@ static INT32 Darius2Init()
BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &Darius2FMIRQHandler, Darius2SynchroniseStream, Darius2GetTime, 0); BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &Darius2FMIRQHandler, Darius2SynchroniseStream, Darius2GetTime, 0);
BurnTimerAttachZet(16000000 / 4); BurnTimerAttachZet(16000000 / 4);
BurnYM2610SetSoundMixMode(1); BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
TaitoDrawFunction = Darius2Draw; TaitoDrawFunction = Darius2Draw;
TaitoMakeInputsFunction = Darius2MakeInputs; TaitoMakeInputsFunction = Darius2MakeInputs;
@ -1506,7 +1508,9 @@ static INT32 Darius2dInit()
BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &Darius2FMIRQHandler, Darius2SynchroniseStream, Darius2GetTime, 0); BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &Darius2FMIRQHandler, Darius2SynchroniseStream, Darius2GetTime, 0);
BurnTimerAttachZet(16000000 / 4); BurnTimerAttachZet(16000000 / 4);
BurnYM2610SetSoundMixMode(1); BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
TaitoDrawFunction = Darius2dDraw; TaitoDrawFunction = Darius2dDraw;
TaitoMakeInputsFunction = Darius2dMakeInputs; TaitoMakeInputsFunction = Darius2dMakeInputs;
@ -1614,7 +1618,9 @@ static INT32 WarriorbInit()
BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &Darius2FMIRQHandler, Darius2SynchroniseStream, Darius2GetTime, 0); BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &Darius2FMIRQHandler, Darius2SynchroniseStream, Darius2GetTime, 0);
BurnTimerAttachZet(16000000 / 4); BurnTimerAttachZet(16000000 / 4);
BurnYM2610SetSoundMixMode(1); BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
TaitoDrawFunction = WarriorbDraw; TaitoDrawFunction = WarriorbDraw;
TaitoMakeInputsFunction = WarriorbMakeInputs; TaitoMakeInputsFunction = WarriorbMakeInputs;
@ -1633,8 +1639,6 @@ static INT32 Darius2Exit()
{ {
Ninjaw = 0; Ninjaw = 0;
BurnYM2610SetSoundMixMode(0);
return TaitoExit(); return TaitoExit();
} }

6
src/burn/drv/taito/d_othunder.cpp
View File

@ -815,7 +815,9 @@ static INT32 OthunderInit()
BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &OthunderFMIRQHandler, OthunderSynchroniseStream, OthunderGetTime, 0); BurnYM2610Init(16000000 / 2, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &OthunderFMIRQHandler, OthunderSynchroniseStream, OthunderGetTime, 0);
BurnTimerAttachZet(16000000 / 4); BurnTimerAttachZet(16000000 / 4);
BurnYM2610SetSoundMixMode(1); BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
EEPROMInit(&othunder_eeprom_interface); EEPROMInit(&othunder_eeprom_interface);
if (!EEPROMAvailable()) EEPROMFill(TaitoDefaultEEProm, 0, 128); if (!EEPROMAvailable()) EEPROMFill(TaitoDefaultEEProm, 0, 128);
@ -839,8 +841,6 @@ static INT32 OthunderInit()
static INT32 OthunderExit() static INT32 OthunderExit()
{ {
BurnYM2610SetSoundMixMode(0);
TaitoExit(); TaitoExit();
// Switch back CPU core if needed // Switch back CPU core if needed

5
src/burn/drv/taito/d_taitob.cpp
View File

@ -1810,7 +1810,9 @@ static void common_ym2610_init()
BurnYM2610Init(8000000, TaitoYM2610ARom, &len0, TaitoYM2610BRom, &len1, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0); BurnYM2610Init(8000000, TaitoYM2610ARom, &len0, TaitoYM2610BRom, &len1, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0);
BurnTimerAttachZet(cpu_speed[1]); BurnTimerAttachZet(cpu_speed[1]);
BurnYM2610SetSoundMixMode(1); BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_BOTH);
BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
} }
static void common_ym2203_init() static void common_ym2203_init()
@ -1905,7 +1907,6 @@ static INT32 DrvExit()
ZetExit(); ZetExit();
if (sound_config == 0) { if (sound_config == 0) {
BurnYM2610SetSoundMixMode(0);
BurnYM2610Exit(); BurnYM2610Exit();
} else { } else {
BurnYM2203Exit(); BurnYM2203Exit();

2
src/burn/drv/taito/d_taitoz.cpp
View File

@ -4921,8 +4921,6 @@ static INT32 SpacegunInit()
static INT32 TaitoZExit() static INT32 TaitoZExit()
{ {
BurnYM2610SetSoundMixMode(0);
TaitoExit(); TaitoExit();
SciSpriteFrame = 0; SciSpriteFrame = 0;

9
src/burn/snd/burn_ym2610.cpp
View File

@ -433,15 +433,6 @@ void BurnYM2610SetRoute(INT32 nIndex, double nVolume, INT32 nRouteDir)
YM2610RouteDirs[nIndex] = nRouteDir; YM2610RouteDirs[nIndex] = nRouteDir;
} }
void BurnYM2610SetSoundMixMode(INT32)
{
#if defined FBA_DEBUG
if (!DebugSnd_YM2610Initted) bprintf(PRINT_ERROR, _T("BurnYM2610SetSoundMixMode called without init\n"));
#endif
// deprecated - to be removed
}
void BurnYM2610Scan(INT32 nAction, INT32* pnMin) void BurnYM2610Scan(INT32 nAction, INT32* pnMin)
{ {
#if defined FBA_DEBUG #if defined FBA_DEBUG

1
src/burn/snd/burn_ym2610.h
View File

@ -11,7 +11,6 @@ extern "C" void BurnYM2610UpdateRequest();
void BurnYM2610MapADPCMROM(UINT8* YM2610ADPCMAROM, INT32 nYM2610ADPCMASize, UINT8* YM2610ADPCMBROM, INT32 nYM2610ADPCMBSize); void BurnYM2610MapADPCMROM(UINT8* YM2610ADPCMAROM, INT32 nYM2610ADPCMASize, UINT8* YM2610ADPCMBROM, INT32 nYM2610ADPCMBSize);
INT32 BurnYM2610Init(INT32 nClockFrequency, UINT8* YM2610ADPCMAROM, INT32* nYM2610ADPCMASize, UINT8* YM2610ADPCMBROM, INT32* nYM2610ADPCMBSize, FM_IRQHANDLER IRQCallback, INT32 (*StreamCallback)(INT32), double (*GetTimeCallback)(), INT32 bAddSignal); INT32 BurnYM2610Init(INT32 nClockFrequency, UINT8* YM2610ADPCMAROM, INT32* nYM2610ADPCMASize, UINT8* YM2610ADPCMBROM, INT32* nYM2610ADPCMBSize, FM_IRQHANDLER IRQCallback, INT32 (*StreamCallback)(INT32), double (*GetTimeCallback)(), INT32 bAddSignal);
void BurnYM2610SetRoute(INT32 nIndex, double nVolume, INT32 nRouteDir); void BurnYM2610SetRoute(INT32 nIndex, double nVolume, INT32 nRouteDir);
void BurnYM2610SetSoundMixMode(INT32 Mix);
void BurnYM2610Reset(); void BurnYM2610Reset();
void BurnYM2610Exit(); void BurnYM2610Exit();
extern void (*BurnYM2610Update)(INT16* pSoundBuf, INT32 nSegmentEnd); extern void (*BurnYM2610Update)(INT16* pSoundBuf, INT32 nSegmentEnd);