From 98ae230d2df34f105d311057c1f6140319749676 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 1 Jun 2021 23:00:18 +1000
Subject: [PATCH] Android: Add missing CD-ROM options to advanced

---
 android/app/src/main/res/values/strings.xml       |  9 +++++++--
 .../app/src/main/res/xml/advanced_preferences.xml | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 0d1c53c30..d21e9ea17 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -26,9 +26,9 @@
     <string name="settings_summary_video_sync">Enable this option to match DuckStation\'s refresh rate with your current monitor or screen. VSync is automatically disabled when it is not possible (e.g. running at non-100% speed).</string>
     <string name="settings_video_sync">Video Sync</string>
     <string name="settings_cpu_overclocking">CPU Overclocking</string>
-    <string name="settings_cdrom_region_check">CD-ROM Region Check</string>
+    <string name="settings_cdrom_region_check">Region Check</string>
     <string name="settings_summary_cdrom_region_check">Prevents discs from incorrect regions being read by the emulator. Usually safe to disable.</string>
-    <string name="settings_cdrom_preload_image_to_ram">CD-ROM Preload Image to RAM</string>
+    <string name="settings_cdrom_preload_image_to_ram">Preload Image to RAM</string>
     <string name="settings_summary_preload_image_to_ram">Loads the game image into RAM. Useful for network paths that may become unreliable during gameplay. In some cases also eliminates stutter when games initiate audio track playback.</string>
     <string name="settings_pgxp_vertex_cache">PGXP Vertex Cache</string>
     <string name="settings_summary_pgxp_vertex_cache">Uses screen coordinates as a fallback when tracking vertices through memory fails. May improve PGXP compatibility.</string>
@@ -357,4 +357,9 @@
     <string name="controller_settings_auto_fire_n_button">Auto Fire %d Button</string>
     <string name="controller_settings_auto_fire_n_frequency">Auto Fire %d Frequency/Interval</string>
     <string name="controller_binding_auto_fire_n">Auto Fire %d</string>
+    <string name="settings_category_cdrom">CD-ROM Settings</string>
+    <string name="settings_cdrom_read_thread">Use Read Thread (Asynchronous)</string>
+    <string name="settings_summary_read_thread">Reduces hitches in emulation by reading/decompressing CD data asynchronously on a worker thread.</string>
+    <string name="settings_cdrom_load_image_patches">Apply Image Patches</string>
+    <string name="settings_summary_load_image_patches">Automatically applies patches to disc images when they are present, currently only PPF is supported.</string>
 </resources>
diff --git a/android/app/src/main/res/xml/advanced_preferences.xml b/android/app/src/main/res/xml/advanced_preferences.xml
index bc42cc40b..7187e34c9 100644
--- a/android/app/src/main/res/xml/advanced_preferences.xml
+++ b/android/app/src/main/res/xml/advanced_preferences.xml
@@ -119,6 +119,15 @@
             app:defaultValue="Auto"
             app:useSimpleSummaryProvider="true"
             app:iconSpaceReserved="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory app:title="@string/settings_category_cdrom" app:iconSpaceReserved="false">
+        <SwitchPreferenceCompat
+            app:key="CDROM/ReadThread"
+            app:title="@string/settings_cdrom_read_thread"
+            app:defaultValue="true"
+            app:summary="@string/settings_summary_read_thread"
+            app:iconSpaceReserved="false" />
         <SwitchPreferenceCompat
             app:key="CDROM/RegionCheck"
             app:title="@string/settings_cdrom_region_check"
@@ -131,6 +140,12 @@
             app:defaultValue="false"
             app:summary="@string/settings_summary_preload_image_to_ram"
             app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            app:key="CDROM/LoadImagePatches"
+            app:title="@string/settings_cdrom_load_image_patches"
+            app:defaultValue="false"
+            app:summary="@string/settings_summary_load_image_patches"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_category_cpu" app:iconSpaceReserved="false">