From d0de6a0aa9b456eed52573777fa3cec4c5c09b2a Mon Sep 17 00:00:00 2001 From: Connor McLaughlin <stenzek@gmail.com> Date: Sun, 23 May 2021 18:04:48 +1000 Subject: [PATCH] Android: Expose CD-ROM seek speedup enhancement --- .../duckstation/GamePropertiesActivity.java | 1 + android/app/src/main/res/values/arrays.xml | 26 +++++++++++++++++++ android/app/src/main/res/values/strings.xml | 2 ++ .../main/res/xml/enhancements_preferences.xml | 9 +++++++ 4 files changed, 38 insertions(+) diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java index 7668903a7..cc42b21c4 100644 --- a/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java +++ b/android/app/src/main/java/com/github/stenzek/duckstation/GamePropertiesActivity.java @@ -116,6 +116,7 @@ public class GamePropertiesActivity extends AppCompatActivity { final PreferenceScreen ps = getPreferenceManager().createPreferenceScreen(getContext()); activity.createListGameSetting(ps, "CPUOverclock", R.string.settings_cpu_overclocking, R.array.settings_advanced_cpu_overclock_entries, R.array.settings_advanced_cpu_overclock_values); activity.createListGameSetting(ps, "CDROMReadSpeedup", R.string.settings_cdrom_read_speedup, R.array.settings_cdrom_read_speedup_entries, R.array.settings_cdrom_read_speedup_values); + activity.createListGameSetting(ps, "CDROMSeekSpeedup", R.string.settings_cdrom_seek_speedup, R.array.settings_cdrom_seek_speedup_entries, R.array.settings_cdrom_seek_speedup_values); activity.createListGameSetting(ps, "GPURenderer", R.string.settings_gpu_renderer, R.array.gpu_renderer_entries, R.array.gpu_renderer_values); activity.createListGameSetting(ps, "DisplayAspectRatio", R.string.settings_aspect_ratio, R.array.settings_display_aspect_ratio_names, R.array.settings_display_aspect_ratio_values); diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml index a0f9d4811..fda4207b8 100644 --- a/android/app/src/main/res/values/arrays.xml +++ b/android/app/src/main/res/values/arrays.xml @@ -494,4 +494,30 @@ <item>6</item> <item>7</item> </string-array> + <string-array name="settings_cdrom_seek_speedup_entries"> + <item>Infinite/Instantaneous</item> + <item>None (Normal Speed)</item> + <item>2x</item> + <item>3x</item> + <item>4x</item> + <item>5x</item> + <item>6x</item> + <item>7x</item> + <item>8x</item> + <item>9x</item> + <item>10x</item> + </string-array> + <string-array name="settings_cdrom_seek_speedup_values"> + <item>0</item> + <item>1</item> + <item>2</item> + <item>3</item> + <item>4</item> + <item>5</item> + <item>6</item> + <item>7</item> + <item>8</item> + <item>9</item> + <item>10</item> + </string-array> </resources> diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 969ab0183..22659f534 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -350,4 +350,6 @@ <string name="settings_summary_use_software_renderer_for_readbacks">Runs the software renderer in parallel for VRAM readbacks. On some devices, this may result in greater performance when using graphical enhancements with the hardware renderer.</string> <string name="settings_use_software_renderer">Use Software Renderer</string> <string name="settings_disable_widescreen">Disable Widescreen</string> + <string name="settings_cdrom_seek_speedup">CD-ROM Seek Speedup</string> + <string name="settings_summary_cdrom_seek_speedup">Speeds up CD-ROM seeks by the specified factor. May improve loading speeds in some games, at the cost of breaking others.</string> </resources> diff --git a/android/app/src/main/res/xml/enhancements_preferences.xml b/android/app/src/main/res/xml/enhancements_preferences.xml index 0e4f946b3..a0621cfd9 100644 --- a/android/app/src/main/res/xml/enhancements_preferences.xml +++ b/android/app/src/main/res/xml/enhancements_preferences.xml @@ -24,6 +24,15 @@ app:summary="@string/settings_summary_cdrom_read_speedup" app:useSimpleSummaryProvider="true" app:iconSpaceReserved="false" /> + <ListPreference + app:key="CDROM/SeekSpeedup" + app:title="@string/settings_cdrom_seek_speedup" + app:entries="@array/settings_cdrom_seek_speedup_entries" + app:entryValues="@array/settings_cdrom_seek_speedup_values" + app:defaultValue="1" + app:summary="@string/settings_summary_cdrom_seek_speedup" + app:useSimpleSummaryProvider="true" + app:iconSpaceReserved="false" /> <SwitchPreferenceCompat app:key="BIOS/PatchFastBoot" app:title="@string/settings_console_fast_boot"