ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Wii Sports sound again 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1170 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2008-11-14 12:06:53 +00:00
parent 2976f3f1e3
commit e94ac8efa3
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AXWii.cpp
View File

@ -45,6 +45,7 @@ extern CDebugger * m_frame;
CUCode_AXWii::CUCode_AXWii(CMailHandler& _rMailHandler, u32 _CRC) CUCode_AXWii::CUCode_AXWii(CMailHandler& _rMailHandler, u32 _CRC)
: IUCode(_rMailHandler) : IUCode(_rMailHandler)
, m_addressPBs(0xFFFFFFFF) , m_addressPBs(0xFFFFFFFF)
, _CRC(_CRC)
{ {
// we got loaded // we got loaded
m_rMailHandler.PushMail(0xDCD10000); m_rMailHandler.PushMail(0xDCD10000);
@ -55,7 +56,6 @@ CUCode_AXWii::CUCode_AXWii(CMailHandler& _rMailHandler, u32 _CRC)
lCUCode_AX = new CUCode_AX(_rMailHandler); lCUCode_AX = new CUCode_AX(_rMailHandler);
lCUCode_AX->_CRC = _CRC; lCUCode_AX->_CRC = _CRC;
_CRC = _CRC;
} }
CUCode_AXWii::~CUCode_AXWii() CUCode_AXWii::~CUCode_AXWii()
@ -80,14 +80,16 @@ void CUCode_AXWii::HandleMail(u32 _uMail)
void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize) void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize)
{ {
LOG_(0, "MixAdd %08x", _CRC);
if(_CRC == 0xfa450138) if(_CRC == 0xfa450138)
{ {
LOG_(0, "THIS");
AXParamBlockWii PBs[NUMBER_OF_PBS]; AXParamBlockWii PBs[NUMBER_OF_PBS];
MixAdd_( _pBuffer, _iSize, PBs); MixAdd_( _pBuffer, _iSize, PBs);
} }
else else
{ {
//LOG_(0, "else"); LOG_(0, "else");
AXParamBlockWii_ PBs[NUMBER_OF_PBS]; AXParamBlockWii_ PBs[NUMBER_OF_PBS];
MixAdd_(_pBuffer, _iSize, PBs); MixAdd_(_pBuffer, _iSize, PBs);
} }
@ -96,7 +98,6 @@ void CUCode_AXWii::MixAdd(short* _pBuffer, int _iSize)
template<class ParamBlockType> template<class ParamBlockType>
void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs) void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
//void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize)
{ {
//AXParamBlockWii PBs[NUMBER_OF_PBS]; //AXParamBlockWii PBs[NUMBER_OF_PBS];
@ -183,20 +184,8 @@ void CUCode_AXWii::MixAdd_(short* _pBuffer, int _iSize, ParamBlockType &PBs)
for (int i = 0; i < numberOfPBs; i++) for (int i = 0; i < numberOfPBs; i++)
{ {
if(_CRC == 0xfa450138)
{
//ParamBlockType pb = PBs[i];
//AXParamBlockWii& pb = PBs[i];
//MixAddVoice(pb, templbuffer, temprbuffer, _iSize);
MixAddVoice(PBs[i], templbuffer, temprbuffer, _iSize); MixAddVoice(PBs[i], templbuffer, temprbuffer, _iSize);
} }
else
{
//AXParamBlockWii_& pb = PBs[i];
//MixAddVoice(pb, templbuffer, temprbuffer, _iSize);
MixAddVoice(PBs[i], templbuffer, temprbuffer, _iSize);
}
}
WriteBackPBsWii(m_addressPBs, PBs, numberOfPBs); WriteBackPBsWii(m_addressPBs, PBs, numberOfPBs);
// We write the sound to _pBuffer // We write the sound to _pBuffer