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

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

Minor Ucode cleanup.
This commit is contained in:
Pierre Bourdon 2014-03-27 22:48:25 +01:00
parent b7599f7d3a 23174d25c6
commit ee091329f7
5 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Core/HW/DSPHLE/UCodes/UCode_AXWii.cpp
View File

@ -4,7 +4,6 @@
// //
#define AX_WII // Used in UCode_AX_Voice. #define AX_WII // Used in UCode_AX_Voice.
#include "AudioCommon/Mixer.h"
#include "Common/MathUtil.h" #include "Common/MathUtil.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"

9
Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda.cpp
View File

@ -6,9 +6,6 @@
// Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess, // Zelda: The Windwaker, Mario Sunshine, Mario Kart, Twilight Princess,
// Super Mario Galaxy // Super Mario Galaxy
#include "AudioCommon/Mixer.h"
#include "AudioCommon/WaveFile.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/HW/DSP.h" #include "Core/HW/DSP.h"
#include "Core/HW/DSPHLE/MailHandler.h" #include "Core/HW/DSPHLE/MailHandler.h"
@ -204,9 +201,6 @@ void CUCode_Zelda::HandleMail_SMSVersion(u32 _uMail)
m_rMailHandler.PushMail(DSP_FRAME_END); m_rMailHandler.PushMail(DSP_FRAME_END);
// DSP::GenerateDSPInterruptFromDSPEmu(DSP::INT_DSP); // 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; m_bSyncCmdPending = false;
} }
} }
@ -315,9 +309,6 @@ void CUCode_Zelda::HandleMail_NormalVersion(u32 _uMail)
m_rMailHandler.PushMail(DSP_FRAME_END); m_rMailHandler.PushMail(DSP_FRAME_END);
//g_dspInitialize.pGenerateDSPInterrupt(); //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; m_bSyncCmdPending = false;
} }
} }

7
Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Synth.cpp
View File

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

2
Source/Core/Core/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp
View File

@ -4,8 +4,6 @@
#include <sstream> #include <sstream>
#include "AudioCommon/AudioCommon.h"
#include "AudioCommon/Mixer.h"
#include "Common/MathUtil.h" #include "Common/MathUtil.h"
#include "Core/HW/DSP.h" #include "Core/HW/DSP.h"

1
Source/Core/Core/HW/DSPLLE/DSPLLEGlobals.h
View File

@ -4,7 +4,6 @@
#pragma once #pragma once
#include "AudioCommon/AudioCommon.h"
#include "Common/Common.h" #include "Common/Common.h"
// TODO: Get rid of this file. // TODO: Get rid of this file.