From 9b6703b3adef9210227f0a0dc3c549fe209ad397 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 12 Jun 2014 19:07:27 +0200 Subject: [PATCH] (Android frontend) audio_latency is now set in native activity instead of Android frontend --- .../com/retroarch/browser/mainmenu/MainMenuFragment.java | 5 ----- .../browser/preferences/util/UserPreferences.java | 7 ------- 2 files changed, 12 deletions(-) diff --git a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java index 6d12e39c9a..e9d528948a 100644 --- a/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java +++ b/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuFragment.java @@ -226,7 +226,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On edit.putString("video_refresh_rate", Double.toString(60.00d)); edit.putBoolean("input_overlay_enable", false); edit.putBoolean("input_autodetect_enable", true); - edit.putString("audio_latency", "64"); edit.putBoolean("audio_latency_auto", true); edit.commit(); UserPreferences.updateConfigFile(ctx); @@ -249,7 +248,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On SharedPreferences.Editor edit = prefs.edit(); edit.putBoolean("input_overlay_enable", false); edit.putBoolean("input_autodetect_enable", true); - edit.putString("audio_latency", "160"); edit.putBoolean("audio_latency_auto", false); edit.commit(); UserPreferences.updateConfigFile(ctx); @@ -272,7 +270,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On SharedPreferences.Editor edit = prefs.edit(); edit.putBoolean("input_overlay_enable", false); edit.putBoolean("input_autodetect_enable", true); - edit.putString("audio_latency", "64"); edit.putBoolean("audio_latency_auto", true); edit.commit(); UserPreferences.updateConfigFile(ctx); @@ -297,7 +294,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On edit.putBoolean("input_overlay_enable", false); edit.putBoolean("input_autodetect_enable", true); edit.putString("video_refresh_rate", Double.toString(59.19132938771038)); - edit.putString("audio_latency", "128"); edit.putBoolean("audio_latency_auto", false); edit.commit(); UserPreferences.updateConfigFile(ctx); @@ -319,7 +315,6 @@ public final class MainMenuFragment extends PreferenceListFragment implements On SharedPreferences prefs = UserPreferences.getPreferences(ctx); SharedPreferences.Editor edit = prefs.edit(); edit.putString("video_refresh_rate", Double.toString(59.65)); - edit.putString("audio_latency", "64"); edit.putBoolean("audio_latency_auto", false); edit.commit(); UserPreferences.updateConfigFile(ctx); diff --git a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java index 5866e34c88..c39a89edbf 100644 --- a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java +++ b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java @@ -176,15 +176,8 @@ public final class UserPreferences if (Build.VERSION.SDK_INT >= 17 && prefs.getBoolean("audio_latency_auto", true)) { int buffersize = getLowLatencyBufferSize(ctx); - - config.setInt("audio_latency", 64); config.setInt("audio_block_frames", buffersize); } - else - { - String latency_audio = prefs.getString("audio_latency", "64"); - config.setInt("audio_latency", Integer.parseInt(latency_audio)); - } config.setBoolean("audio_enable", prefs.getBoolean("audio_enable", true)); config.setBoolean("video_smooth", prefs.getBoolean("video_smooth", true));