Merge pull request #217 from magumagu/minor-ucode-cleanup

Minor Ucode cleanup.
dolphin-emu · Mar 27, 2014 · ee09132 · ee09132
2 parents b7599f7 + 23174d2
commit ee09132
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 19 deletions.
diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
@@ -4,7 +4,6 @@
 //
 #define AX_WII // Used in UCode_AX_Voice.
 
-#include "AudioCommon/Mixer.h"
 #include "Common/MathUtil.h"
 #include "Common/StringUtil.h"
 

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
@@ -6,9 +6,6 @@
 // Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess,
 // Super Mario Galaxy
 
-#include "AudioCommon/Mixer.h"
-#include "AudioCommon/WaveFile.h"
-
 #include "Core/ConfigManager.h"
 #include "Core/HW/DSP.h"
 #include "Core/HW/DSPHLE/MailHandler.h"
@@ -204,9 +201,6 @@ void CUCode_Zelda::HandleMail_SMSVersion(u32 _uMail)
 					m_rMailHandler.PushMail(DSP_FRAME_END);
 					// DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP);
 
-					DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync");
-					// soundStream->Update(); //do it in this thread to avoid sync problems
-
 					m_bSyncCmdPending = false;
 				}
 			}
@@ -315,9 +309,6 @@ void CUCode_Zelda::HandleMail_NormalVersion(u32 _uMail)
 						m_rMailHandler.PushMail(DSP_FRAME_END);
 					//g_dspInitialize.pGenerateDSPInterrupt();
 
-					DEBUG_LOG(DSPHLE, "Update the SoundThread to be in sync");
-					// soundStream->Update(); //do it in this thread to avoid sync problems
-
 					m_bSyncCmdPending = false;
 				}
 			}

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
@@ -4,17 +4,12 @@
 
 #include <cmath>
 
-#include "AudioCommon/AudioCommon.h"
-#include "AudioCommon/Mixer.h"
-
 #include "Core/HW/DSPHLE/UCodes/UCode_Zelda.h"
 #include "Core/HW/DSPHLE/UCodes/UCodes.h"
 
 void CUCode_Zelda::RenderSynth_RectWave(ZeldaVoicePB &PB, s32* _Buffer, int _Size)
 {
-	float _ratioFactor = 32000.0f / (float)soundStream->GetMixer()->GetSampleRate();
-	u32 _ratio = (PB.RatioInt << 16);
-	s64 ratio = (s64)((_ratio * _ratioFactor) * 16);
+	s64 ratio = ((s64)PB.RatioInt << 16) * 16;
 	s64 TrueSamplePosition = PB.CurSampleFrac;
 
 	// PB.Format == 0x3 -> Rectangular Wave, 0x0 -> Square Wave

diff --git a/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
@@ -4,8 +4,6 @@
 
 #include <sstream>
 
-#include "AudioCommon/AudioCommon.h"
-#include "AudioCommon/Mixer.h"
 #include "Common/MathUtil.h"
 
 #include "Core/HW/DSP.h"

diff --git a/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h b/Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include "AudioCommon/AudioCommon.h"
 #include "Common/Common.h"
 
 // TODO: Get rid of this file.