From ad827155e6556713e61885dd26f93ff4746b2066 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Wed, 14 Oct 2020 17:45:23 +1000
Subject: [PATCH] Android: Re-add missing audio options

---
 .../stenzek/duckstation/SettingsActivity.java | 11 ++--
 android/app/src/main/res/values/arrays.xml    |  1 +
 .../src/main/res/xml/audio_preferences.xml    | 56 +++++++++++++++++++
 .../src/main/res/xml/general_preferences.xml  |  2 +-
 4 files changed, 65 insertions(+), 5 deletions(-)
 create mode 100644 android/app/src/main/res/xml/audio_preferences.xml

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java
index 8e031babe..fe4934069 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/SettingsActivity.java
@@ -91,16 +91,19 @@ public class SettingsActivity extends AppCompatActivity {
                 case 0:     // General
                     return new SettingsFragment(R.xml.general_preferences);
 
-                case 1:     // Console
+                case 1:     // Display
                     return new SettingsFragment(R.xml.display_preferences);
 
-                case 2:     // Enhancements
+                case 2:     // Audio
+                    return new SettingsFragment(R.xml.audio_preferences);
+
+                case 3:     // Enhancements
                     return new SettingsFragment(R.xml.enhancements_preferences);
 
-                case 3:     // Controllers
+                case 4:     // Controllers
                     return new SettingsFragment(R.xml.controllers_preferences);
 
-                case 4:     // Advanced
+                case 5:     // Advanced
                     return new SettingsFragment(R.xml.advanced_preferences);
 
                 default:
diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index c424b1971..d8940d7f5 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -227,6 +227,7 @@
     <string-array name="settings_tabs">
         <item>General</item>
         <item>Display</item>
+        <item>Audio</item>
         <item>Enhancements</item>
         <item>Controllers</item>
         <item>Advanced</item>
diff --git a/android/app/src/main/res/xml/audio_preferences.xml b/android/app/src/main/res/xml/audio_preferences.xml
new file mode 100644
index 000000000..2749fac97
--- /dev/null
+++ b/android/app/src/main/res/xml/audio_preferences.xml
@@ -0,0 +1,56 @@
+<!--
+  ~ Copyright 2018 The app Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+        <SwitchPreferenceCompat
+            app:key="Audio/OutputMuted"
+            app:title="Mute All Sound"
+            app:defaultValue="false"
+            app:summary="Prevents the emulator from emitting any sound."
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            app:key="CDROM/MuteCDAudio"
+            app:title="Mute CD Audio"
+            app:defaultValue="false"
+            app:summary="Forcibly mutes both CD-DA and XA audio from the CD-ROM. Can be used to disable background music in some games."
+            app:iconSpaceReserved="false" />
+        <ListPreference
+            app:key="Audio/Backend"
+            app:title="Audio Backend"
+            app:entries="@array/settings_audio_backend_entries"
+            app:entryValues="@array/settings_audio_backend_values"
+            app:defaultValue="OpenSLES"
+            app:useSimpleSummaryProvider="true"
+            app:iconSpaceReserved="false"/>
+        <ListPreference
+            app:key="Audio/BufferSize"
+            app:title="Audio Buffer Size"
+            app:entries="@array/settings_audio_buffer_size_entries"
+            app:entryValues="@array/settings_audio_buffer_size_values"
+            app:defaultValue="2048"
+            app:summary="Determines the latency between audio being generated and output to speakers. Smaller values reduce latency, but variations in emulation speed will cause hitches."
+            app:useSimpleSummaryProvider="true"
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            app:key="Audio/Sync"
+            app:title="Audio Sync"
+            app:defaultValue="true"
+            app:summary="Throttles the emulation speed based on the audio backend pulling audio frames. This helps to remove noises or crackling if emulation is too fast. Sync will automatically be disabled if not running at 100% speed."
+            app:iconSpaceReserved="false" />
+
+</PreferenceScreen>
diff --git a/android/app/src/main/res/xml/general_preferences.xml b/android/app/src/main/res/xml/general_preferences.xml
index 58e4eba24..7abc7e16d 100644
--- a/android/app/src/main/res/xml/general_preferences.xml
+++ b/android/app/src/main/res/xml/general_preferences.xml
@@ -38,7 +38,7 @@
         <SwitchPreferenceCompat
             app:key="Display/VSync"
             app:title="Video Sync"
-            app:defaultValue="true"
+            app:defaultValue="false"
             app:summary="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)."
             app:iconSpaceReserved="false" />
         <ListPreference