From 47239ce0f4bd61e3e95fb04bc185ae11d4872db4 Mon Sep 17 00:00:00 2001
From: nakeee <nakeee@gmail.com>
Date: Wed, 24 Mar 2010 11:22:33 +0000
Subject: XK patch for adding jit config to audiocommon/c16 function to
 x64emitter and Skidu's fix for 64bit

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5230 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 Source/Core/AudioCommon/Src/AudioCommon.cpp       | 4 ++++
 Source/Core/AudioCommon/Src/AudioCommon.h         | 1 +
 Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 2 ++
 Source/Core/AudioCommon/Src/AudioCommonConfig.h   | 1 +
 4 files changed, 8 insertions(+)

(limited to 'Source/Core/AudioCommon')

diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp
index f34b04acfa..de371d7595 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp
@@ -102,4 +102,8 @@ namespace AudioCommon
 	   
 		return backends;
 	}
+
+	bool UseJIT() {
+		return ac_Config.m_EnableJIT;
+	}
 }
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.h b/Source/Core/AudioCommon/Src/AudioCommon.h
index 6edb792004..68e15f2a19 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.h
+++ b/Source/Core/AudioCommon/Src/AudioCommon.h
@@ -60,6 +60,7 @@ namespace AudioCommon
 	SoundStream *InitSoundStream(CMixer *mixer = NULL);
 	void ShutdownSoundStream();
 	std::vector<std::string> GetSoundBackends();
+	bool UseJIT();
 }
 
 #endif // _AUDIO_COMMON_H_
diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
index a186c5cbaf..f62e4b3863 100644
--- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp
@@ -22,6 +22,7 @@ AudioCommonConfig ac_Config;
 void AudioCommonConfig::Load(IniFile &file) {
 	file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true);
 	file.Get("Config", "EnableThrottle", &m_EnableThrottle, true);
+	file.Get("Config", "EnableJIT", &m_EnableJIT, true);
 	file.Get("Config", "Volume", &m_Volume, 75);
 #ifdef _WIN32
 	file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND);
@@ -38,6 +39,7 @@ void AudioCommonConfig::Load(IniFile &file) {
 void AudioCommonConfig::Set(IniFile &file) {
 	file.Set("Config", "EnableDTKMusic", m_EnableDTKMusic);
 	file.Set("Config", "EnableThrottle", m_EnableThrottle);
+	file.Set("Config", "EnableJIT", m_EnableJIT);
 	file.Set("Config", "Backend", sBackend);
 	file.Set("Config", "Volume", m_Volume);
 }
diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.h b/Source/Core/AudioCommon/Src/AudioCommonConfig.h
index fd15c9fd59..9f1d1f2915 100644
--- a/Source/Core/AudioCommon/Src/AudioCommonConfig.h
+++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.h
@@ -33,6 +33,7 @@ struct AudioCommonConfig
 {
 	bool m_EnableDTKMusic;
     bool m_EnableThrottle;
+	bool m_EnableJIT;
 	int m_Volume;
 #ifdef __APPLE__
 	char sBackend[128];
-- 
cgit v1.2.3