Added Copy EFB hotkey to OpenGL plugin (to be able to easily switch back and forth during emulation). Added Unlimited JIT cache option to debugger. It may fix the Zelda TP crashes.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1243 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 23 insertions, 4 deletions

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
index 4158c4093e..b57e989c9d 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp
@@ -50,6 +50,24 @@ CConfigDlg::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*lParam*/, BO
 	m_comboSampleRate.AddString("48000");

 	m_comboSampleRate.SetCurSel(g_Config.m_SampleRate == 44100 ? 0 : 1);

 

+	// Add tooltips

+	CToolTipCtrl ToolTips;

+	ToolTips.Create(m_hWnd);

+	ToolTips.Activate(true);

+	ToolTips.SetMaxTipWidth(200); // limit the width

+	ToolTips.SetDelayTime(TTDT_AUTOPOP, 20 * 1000); // give us time to read it

+	CToolInfo tiHLE(TTF_SUBCLASS, m_buttonEnableHLEAudio, 0, NULL,

+		"This is the most common sound type");

+	CToolInfo tiDTK(TTF_SUBCLASS, m_buttonEnableDTKMusic, 0, NULL,

+		"This is sometimes used to play music tracks from the disc");

+	CToolInfo tiOther(TTF_SUBCLASS, m_buttonEnableThrottle, 0, NULL,

+		"This is sometimes used together with pre-rendered movies. Disabling this"

+		" also disables the speed throttle that is causes. Meaning that"

+		" there will be no upper limit on your FPS.");

+	ToolTips.AddTool(tiHLE);

+	ToolTips.AddTool(tiDTK);

+	ToolTips.AddTool(tiOther);

+

 	return(TRUE);

 }

 

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
index d91d74b1ba..4f15257ab0 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/PCHW/Mixer.cpp
@@ -109,7 +109,6 @@ void Mixer_PushSamples(short *buffer, int num_stereo_samples, int sample_rate) {
 			Sleep(0);

 		}

 	} else {

-		wprintf("Tab");

 		return;

 	}

 #else

diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
index 7c85c50a6d..385bd7f762 100644
--- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
+++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_AX_Voice.h
@@ -111,7 +111,7 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer,
 	ratioFactor = 32000.0f / 44100.0f;

 #endif

 

-	if(!Wii) DoVoiceHacks(pb);

+	DoVoiceHacks(pb, Wii);

 

 	// =============

 	if (pb.running)

@@ -148,7 +148,7 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer,
 		//if (pb.src_type == 2 && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0))

 		if (pb.running && (pb.src.ratio_hi == 0 && pb.src.ratio_lo == 0))

 		{

-			pb.src.ratio_hi = 1;

+			//pb.src.ratio_hi = 1;

 		}

 		// =============

 

@@ -299,7 +299,7 @@ inline void MixAddVoice(ParamBlockType &pb, int *templbuffer, int *temprbuffer,
 // Voice hacks

 // --------------

 template<class ParamBlockType>

-inline void DoVoiceHacks(ParamBlockType &pb)

+inline void DoVoiceHacks(ParamBlockType &pb, bool Wii)

 {

 	// get necessary values

 	const u32 sampleEnd = (pb.audio_addr.end_addr_hi << 16) | pb.audio_addr.end_addr_lo;

@@ -317,6 +317,7 @@ inline void DoVoiceHacks(ParamBlockType &pb)
 	if (

 		(sampleEnd > (0x017fffff * 2) || loopPos > (0x017fffff * 2)) // ARAM bounds in nibbles

 		&& gSSBMremedy1

+		&& !Wii

 		)

 	{

 		pb.running = 0;

@@ -356,6 +357,7 @@ inline void DoVoiceHacks(ParamBlockType &pb)
 	&& pb.mixer_control == 0 // only use this in SSBM

 

 	&& gSSBMremedy2 // let us turn this fix on and off

+	&& !Wii

 	)

 	{

 		// reset the detection values