Revert "Merge branch 'rt-android' into 'master'"

This reverts commit df9f831a915524e87bf6d63ce86d76589a3fcd6c, reversing
changes made to 1e11e0aecbfdc5ddb7ad835fe673366d68788bc6.

# Conflicts:
#	src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java

src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java

@@ -343,10 +343,8 @@ public final class SettingsFragmentPresenter {
 
         SettingSection audioSection = mSettings.getSection(Settings.SECTION_AUDIO);
         Setting audioStretch = audioSection.getSetting(SettingsFile.KEY_ENABLE_AUDIO_STRETCHING);
-        Setting realtimeAudio = audioSection.getSetting(SettingsFile.KEY_ENABLE_REALTIME_AUDIO);
 
         sl.add(new CheckBoxSetting(SettingsFile.KEY_ENABLE_AUDIO_STRETCHING, Settings.SECTION_AUDIO, R.string.audio_stretch, R.string.audio_stretch_description, true, audioStretch));
-        sl.add(new CheckBoxSetting(SettingsFile.KEY_ENABLE_REALTIME_AUDIO, Settings.SECTION_AUDIO, R.string.realtime_audio, R.string.realtime_audio_description, false, realtimeAudio));
     }
 
     private void addDebugSettings(ArrayList<SettingsItem> sl) {

src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java

@@ -57,7 +57,6 @@ public final class SettingsFile {
 
     public static final String KEY_AUDIO_OUTPUT_ENGINE = "output_engine";
     public static final String KEY_ENABLE_AUDIO_STRETCHING = "enable_audio_stretching";
-    public static final String KEY_ENABLE_REALTIME_AUDIO = "enable_realtime_audio";
     public static final String KEY_VOLUME = "volume";
 
     public static final String KEY_USE_VIRTUAL_SD = "use_virtual_sd";

src/android/app/src/main/jni/config.cpp

@@ -169,8 +169,6 @@ void Config::ReadValues() {
         sdl2_config->GetString("Audio", "mic_input_device", "Default");
     Settings::values.mic_input_type =
         static_cast<Settings::MicInputType>(sdl2_config->GetInteger("Audio", "mic_input_type", 0));
-    Settings::values.enable_realtime_audio =
-            sdl2_config->GetBoolean("Audio", "enable_realtime_audio", false);
 
     // Data Storage
     Settings::values.use_virtual_sd =

src/android/app/src/main/jni/default_ini.h

@@ -202,11 +202,6 @@ output_engine =
 # 0: No, 1 (default): Yes
 enable_audio_stretching =
 
-# Whether or not to enable the real-time audio processing.
-# This effect adjusts audio speed to match real-time speed and helps prevent audio stutter.
-# 0: No, 1 (default): Yes
-enable_realtime_audio =
-
 # Which audio device to use.
 # auto (default): Auto-select
 output_device =

src/android/app/src/main/res/values/strings.xml

@@ -94,8 +94,6 @@
     <!-- Audio settings strings -->
     <string name="audio_stretch">Enable audio stretching</string>
     <string name="audio_stretch_description">Stretches audio to reduce stuttering. When enabled, increases audio latency and slightly reduces performance.</string>
-    <string name="realtime_audio">Enable real-time audio</string>
-    <string name="realtime_audio_description">Desynchronizes the audio from the current framerate. When enabled, the audio should always be running at fullspeed, even if the game is not.</string>
 
     <!-- Miscellaneous -->
     <string name="clear">Clear</string>

src/audio_core/hle/hle.cpp

@@ -17,7 +17,6 @@
 #elif HAVE_FDK
 #include "audio_core/hle/fdk_decoder.h"
 #endif
-#include <algorithm>
 #include "audio_core/hle/common.h"
 #include "audio_core/hle/decoder.h"
 #include "audio_core/hle/hle.h"
@@ -31,7 +30,6 @@
 #include "common/logging/log.h"
 #include "core/core.h"
 #include "core/core_timing.h"
-#include "core/settings.h"
 
 SERIALIZE_EXPORT_IMPL(AudioCore::DspHle)
 
@@ -450,11 +448,7 @@ void DspHle::Impl::AudioTickCallback(s64 cycles_late) {
 
     // Reschedule recurrent event
     Core::Timing& timing = Core::System::GetInstance().CoreTiming();
-    const double time_scale =
+    timing.ScheduleEvent(audio_frame_ticks - cycles_late, tick_event);
-        Settings::values.enable_realtime_audio
-            ? std::clamp(Core::System::GetInstance().GetLastFrameTimeScale(), 1.0, 3.0)
-            : 1.0;
-    timing.ScheduleEvent(audio_frame_ticks / time_scale - cycles_late, tick_event);
 }
 
 DspHle::DspHle(Memory::MemorySystem& memory) : impl(std::make_unique<Impl>(*this, memory)) {}

src/core/core.cpp

@@ -339,10 +339,6 @@ PerfStats::Results System::GetAndResetPerfStats() {
                                   : PerfStats::Results{};
 }
 
-double System::GetLastFrameTimeScale() {
-    return perf_stats->GetLastFrameTimeScale();
-}
-
 void System::Reschedule() {
     if (!reschedule_pending) {
         return;

src/core/core.h

@@ -168,8 +168,6 @@ public:
 
     PerfStats::Results GetAndResetPerfStats();
 
-    double GetLastFrameTimeScale();
-
     /**
      * Gets a reference to the emulated CPU.
      * @returns A reference to the emulated CPU.

src/core/settings.cpp

@@ -102,7 +102,6 @@ void LogSettings() {
     LogSetting("Audio_EnableDspLleMultithread", Settings::values.enable_dsp_lle_multithread);
     LogSetting("Audio_OutputEngine", Settings::values.sink_id);
     LogSetting("Audio_EnableAudioStretching", Settings::values.enable_audio_stretching);
-    LogSetting("Audio_EnableRealTime", Settings::values.enable_realtime_audio);
     LogSetting("Audio_OutputDevice", Settings::values.audio_device_id);
     LogSetting("Audio_InputDeviceType", static_cast<int>(Settings::values.mic_input_type));
     LogSetting("Audio_InputDevice", Settings::values.mic_input_device);

src/core/settings.h

@@ -193,7 +193,6 @@ struct Values {
     bool enable_dsp_lle_multithread;
     std::string sink_id;
     bool enable_audio_stretching;
-    bool enable_realtime_audio;
     std::string audio_device_id;
     float volume;
     MicInputType mic_input_type;

src/core/telemetry_session.cpp

@@ -162,8 +162,6 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader) {
     AddField(Telemetry::FieldType::UserConfig, "Audio_SinkId", Settings::values.sink_id);
     AddField(Telemetry::FieldType::UserConfig, "Audio_EnableAudioStretching",
              Settings::values.enable_audio_stretching);
-    AddField(Telemetry::FieldType::UserConfig, "Audio_EnableRealTime",
-             Settings::values.enable_realtime_audio);
     AddField(Telemetry::FieldType::UserConfig, "Core_UseCpuJit", Settings::values.use_cpu_jit);
     AddField(Telemetry::FieldType::UserConfig, "Renderer_ResolutionFactor",
              Settings::values.resolution_factor);