summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorAnthony Serna <aserna3@gmail.com>2015-09-09 13:58:22 -0700
committerAnthony Serna <aserna3@gmail.com>2015-09-09 14:46:20 -0700
commitcbd7b0793fa2815fa963733c6c54cf16b3e07d2a (patch)
treeaae371526bba3d1a8a9f1e5944435df0b5d7b8d9 /Source
parent38d05cd70f858c7c86e6ed2aab9bd0258157f1d0 (diff)
Removed fastmem from Android UI
Diffstat (limited to 'Source')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java5
-rw-r--r--Source/Android/app/src/main/res/xml/preferences.xml6
2 files changed, 0 insertions, 11 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
index 59573132a4..4a70c75184 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/UserPreferences.java
@@ -46,7 +46,6 @@ public final class UserPreferences
editor.putString("cpuCorePref", getConfig("Dolphin.ini", "Core", "CPUCore", "3"));
editor.putBoolean("dualCorePref", getConfig("Dolphin.ini", "Core", "CPUThread", "True").equals("True"));
- editor.putBoolean("fastmemPref", getConfig("Dolphin.ini", "Core", "Fastmem", "True").equals("True"));
editor.putString("gpuPref", getConfig("Dolphin.ini", "Core", "GFXBackend", "OGL"));
editor.putBoolean("showFPS", getConfig("gfx_opengl.ini", "Settings", "ShowFPS", "False").equals("True"));
@@ -139,9 +138,6 @@ public final class UserPreferences
// Current CPU core being used. Falls back to interpreter upon error.
String currentEmuCore = prefs.getString("cpuCorePref", "0");
- // Fastmem JIT core usage
- boolean isUsingFastmem = prefs.getBoolean("fastmemPref", true);
-
// Current video backend being used. Falls back to software rendering upon error.
String currentVideoBackend = prefs.getString("gpuPref", "Software Rendering");
@@ -221,7 +217,6 @@ public final class UserPreferences
// CPU related Settings
NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUCore", currentEmuCore);
NativeLibrary.SetConfig("Dolphin.ini", "Core", "CPUThread", isUsingDualCore ? "True" : "False");
- NativeLibrary.SetConfig("Dolphin.ini", "Core", "Fastmem", isUsingFastmem ? "True" : "False");
// General Video Settings
NativeLibrary.SetConfig("Dolphin.ini", "Core", "GFXBackend", currentVideoBackend);
diff --git a/Source/Android/app/src/main/res/xml/preferences.xml b/Source/Android/app/src/main/res/xml/preferences.xml
index 878689c2a8..6a874289f0 100644
--- a/Source/Android/app/src/main/res/xml/preferences.xml
+++ b/Source/Android/app/src/main/res/xml/preferences.xml
@@ -19,12 +19,6 @@
android:entries="@array/string_emu_cores"
android:entryValues="@array/int_emu_cores"/>
- <CheckBoxPreference
- android:defaultValue="true"
- android:key="fastmemPref"
- android:summary="@string/fastmem_desc"
- android:title="@string/fastmem"/>
-
</PreferenceCategory>
<PreferenceCategory