piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to move mixer to audio common, it's a bit more complicated than I expected

Browse Source 
so please check I didn't break anything in hle



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2756 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-03-26 09:29:14 +00:00
parent d7038fea17
commit fff663e8c7
35 changed files with 386 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX.cpp
View File

@ -25,7 +25,7 @@ extern CDebugger* m_frame;
#include <sstream>
#include "../Globals.h"
#include "../PCHW/Mixer.h"
#include "Mixer.h"
#include "../MailHandler.h"
#include "UCodes.h"
@ -513,7 +513,7 @@ bool CUCode_AX::AXTask(u32& _uMail)
m_addressPBs = Memory_Read_U32(uAddress);
uAddress += 4;
mixer_HLEready = true;
soundStream->GetMixer()->SetHLEReady(true);
SaveLog("%08x : AXLIST PB address: %08x", uAddress, m_addressPBs);
SaveLog("Update the SoundThread to be in sync");

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

@ -23,8 +23,8 @@
extern CDebugger * m_frame;
#endif
#include "../PCHW/Mixer.h"
#include "../MailHandler.h"
#include "Mixer.h"
#include "UCodes.h"
#include "UCode_AXStructs.h"
@ -324,7 +324,7 @@ bool CUCode_AXWii::AXTask(u32& _uMail)
case 0x0004: // PBs are here now
m_addressPBs = Memory_Read_U32(uAddress);
lCUCode_AX->m_addressPBs = m_addressPBs; // for the sake of logging
mixer_HLEready = true;
soundStream->GetMixer()->SetHLEReady(true);
SaveLog("%08x : AXLIST PB address: %08x", uAddress, m_addressPBs);
soundStream->Update();
uAddress += 4;

5
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
View File

@ -21,7 +21,7 @@
#include "UCode_AX_ADPCM.h"
#include "UCode_AX.h"
#include "../main.h"
#include "Mixer.h"
// ----------------------------------------------------
// Externals
@ -107,7 +107,7 @@ inline void WriteBackPBsWii(u32 pbs_address, ParamBlockType& _pPBs, int _num)
template<class ParamBlockType>
inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer, int _iSize, bool Wii)
{
ratioFactor = 32000.0f / (float)soundStream->GetSampleRate();
ratioFactor = 32000.0f / (float)soundStream->GetMixer()->GetSampleRate();
DoVoiceHacks(pb, Wii);
@ -115,7 +115,6 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer,
if (pb.running)
{
// =======================================================================================
// Read initial parameters
// ------------
//constants

5
Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.cpp
View File

@ -24,7 +24,7 @@
#include "../MailHandler.h"
#include "../main.h"
#include "../PCHW/Mixer.h"
#include "Mixer.h"
CUCode_Zelda::CUCode_Zelda(CMailHandler& _rMailHandler)
@ -157,8 +157,7 @@ void CUCode_Zelda::ExecuteList()
tmp[2] = Read32();
// We're ready to mix
mixer_HLEready = true;
soundStream->GetMixer()->SetHLEReady(true);
DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync");
soundStream->Update(); //do it in this thread to avoid sync problems