diff --git a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp index d73a749ccb..4e43156373 100644 --- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp +++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp @@ -75,9 +75,8 @@ void DSPHLE::DSP_Update(int cycles) u32 DSPHLE::DSP_UpdateRate() { // AX HLE uses 3ms (Wii) or 5ms (GC) timing period - int fields = VideoInterface::GetNumFields(); if (m_pUCode != nullptr) - return (SystemTimers::GetTicksPerSecond() / 1000) * m_pUCode->GetUpdateMs() / fields; + return (SystemTimers::GetTicksPerSecond() / 1000) * m_pUCode->GetUpdateMs(); else return SystemTimers::GetTicksPerSecond() / 1000; } diff --git a/Source/Core/Core/HW/SystemTimers.cpp b/Source/Core/Core/HW/SystemTimers.cpp index c907d3f1a1..af06de378e 100644 --- a/Source/Core/Core/HW/SystemTimers.cpp +++ b/Source/Core/Core/HW/SystemTimers.cpp @@ -114,8 +114,7 @@ static void DSPCallback(u64 userdata, int cyclesLate) static void AudioDMACallback(u64 userdata, int cyclesLate) { - int fields = VideoInterface::GetNumFields(); - int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32 * fields); + int period = CPU_CORE_CLOCK / (AudioInterface::GetAIDSampleRate() * 4 / 32); DSP::UpdateAudioDMA(); // Push audio to speakers. CoreTiming::ScheduleEvent(period - cyclesLate, et_AudioDMA); } @@ -242,7 +241,7 @@ void Init() // FYI, WII_IPC_HLE_Interface::Update is also called in WII_IPCInterface::Write32 const int freq = 1500; - IPC_HLE_PERIOD = GetTicksPerSecond() / (freq * VideoInterface::GetNumFields()); + IPC_HLE_PERIOD = GetTicksPerSecond() / freq; } // System internal sample rate is fixed at 32KHz * 4 (16bit Stereo) / 32 bytes DMA diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index e0f18b7530..49e29278a6 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -476,11 +476,6 @@ void UpdateParameters() } } -int GetNumFields() -{ - return 1; -} - unsigned int GetTicksPerLine() { if (s_lineCount == 0) diff --git a/Source/Core/Core/HW/VideoInterface.h b/Source/Core/Core/HW/VideoInterface.h index cf7e5ab83d..fda979facd 100644 --- a/Source/Core/Core/HW/VideoInterface.h +++ b/Source/Core/Core/HW/VideoInterface.h @@ -353,6 +353,4 @@ union UVIHorizontalStepping unsigned int GetTicksPerLine(); unsigned int GetTicksPerFrame(); - - int GetNumFields(); }