DSPHLE: map memory based on console mode
This commit is contained in:
parent
7c995000ae
commit
8cdad9ce8c
|
@ -11,6 +11,7 @@
|
||||||
#include "Common/CommonTypes.h"
|
#include "Common/CommonTypes.h"
|
||||||
#include "Common/Logging/Log.h"
|
#include "Common/Logging/Log.h"
|
||||||
#include "Common/Swap.h"
|
#include "Common/Swap.h"
|
||||||
|
#include "Core/ConfigManager.h"
|
||||||
#include "Core/HW/DSP.h"
|
#include "Core/HW/DSP.h"
|
||||||
#include "Core/HW/DSPHLE/DSPHLE.h"
|
#include "Core/HW/DSPHLE/DSPHLE.h"
|
||||||
#include "Core/HW/DSPHLE/MailHandler.h"
|
#include "Core/HW/DSPHLE/MailHandler.h"
|
||||||
|
@ -1538,7 +1539,7 @@ void ZeldaAudioRenderer::Resample(VPB* vpb, const s16* src, MixingBuffer* dst)
|
||||||
|
|
||||||
void* ZeldaAudioRenderer::GetARAMPtr() const
|
void* ZeldaAudioRenderer::GetARAMPtr() const
|
||||||
{
|
{
|
||||||
if (m_aram_base_addr)
|
if (SConfig::GetInstance().bWii)
|
||||||
return HLEMemory_Get_Pointer(m_aram_base_addr);
|
return HLEMemory_Get_Pointer(m_aram_base_addr);
|
||||||
else
|
else
|
||||||
return Core::System::GetInstance().GetDSP().GetARAMPtr();
|
return Core::System::GetInstance().GetDSP().GetARAMPtr();
|
||||||
|
|
|
@ -154,9 +154,7 @@ private:
|
||||||
// Coefficients used for resampling.
|
// Coefficients used for resampling.
|
||||||
std::array<s16, 0x100> m_resampling_coeffs{};
|
std::array<s16, 0x100> m_resampling_coeffs{};
|
||||||
|
|
||||||
// If non zero, base MRAM address for sound data transfers from ARAM. On
|
// On the Wii, base address of the MRAM or ExRAM region replacing ARAM.
|
||||||
// the Wii, this points to some MRAM location since there is no ARAM to be
|
|
||||||
// used. If zero, use the top of ARAM.
|
|
||||||
u32 m_aram_base_addr = 0;
|
u32 m_aram_base_addr = 0;
|
||||||
void* GetARAMPtr() const;
|
void* GetARAMPtr() const;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue