From 88a45c3c0fc398092090e7ff44691ef35a3f23bd Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sun, 13 Jan 2013 11:21:54 +0100
Subject: [PATCH] Add refresh rate code.

---
 android/phoenix/res/xml/prefs.xml             |  5 +++
 .../src/org/retroarch/browser/RetroArch.java  | 39 +++++++++++++------
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/android/phoenix/res/xml/prefs.xml b/android/phoenix/res/xml/prefs.xml
index 25aca213e3..c3dfeb6dce 100644
--- a/android/phoenix/res/xml/prefs.xml
+++ b/android/phoenix/res/xml/prefs.xml
@@ -65,6 +65,11 @@
                 android:key="video_sync_refreshrate_to_screen"
                 android:summary="Synchronize RetroArch's refresh rate to the screen's refresh rate (recommended - some screens have refresh rates below 59.95Hz and need this enabled to get good audio/video sync)."
                 android:title="Sync refreshrate to screen" />
+            <EditTextPreference
+                android:key="video_refresh_rate"
+                android:summary="Force a specific refresh rate to be detected. Only use if auto-detection of refresh rate reports wrong refresh rate."
+                android:title="Forced refresh rate (Hz)"
+                android:numeric="decimal" />
             <CheckBoxPreference
                 android:defaultValue="true"
                 android:key="video_allow_rotate"
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index af6238b482..a49d7dfe00 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -51,11 +51,30 @@ public class RetroArch extends Activity implements
 	static private String libretro_path;
 	static private final String TAG = "RetroArch-Phoenix";
 	private ConfigFile config;
-
-	private final double getRefreshRate() {
+	
+	private final double getDisplayRefreshRate() {
 		final WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
 		final Display display = wm.getDefaultDisplay();
-		double rate = display.getRefreshRate();
+		return display.getRefreshRate();
+	}
+
+	private final double getRefreshRate() {
+		double rate = 0;
+		SharedPreferences prefs = PreferenceManager
+				.getDefaultSharedPreferences(getBaseContext());
+		String refresh_rate = prefs.getString("video_refresh_rate", "");
+		if (!refresh_rate.isEmpty()) {
+			try {
+				rate = Double.parseDouble(refresh_rate);
+			} catch (NumberFormatException e) {
+				Log.e(TAG, "Cannot parse: " + refresh_rate + " as a double!");
+				rate = getDisplayRefreshRate();
+			}
+		} else {
+			rate = getDisplayRefreshRate();
+		}
+		
+		Log.i(TAG, "Using refresh rate: " + rate + " Hz.");
 		return rate;
 	}
 	
@@ -200,15 +219,13 @@ public class RetroArch extends Activity implements
 		config.setBoolean("input_autodetect_enable", prefs.getBoolean("input_autodetect_enable", true));
 		config.setBoolean("input_debug_enable", prefs.getBoolean("input_debug_enable", false));
 		
-		if (prefs.getBoolean("video_sync_refreshrate_to_screen", true) &&
-				(getRefreshRate() < 59.95))
-		{
-			Log.i(TAG, "Refresh rate of screen lower than 59.95Hz, adjusting to screen.");	
+		if (prefs.getBoolean("video_sync_refreshrate_to_screen", true)
+				&& (getRefreshRate() < 59.95)) {
+			Log.i(TAG,
+					"Refresh rate of screen lower than 59.95Hz, adjusting to screen.");
 			config.setDouble("video_refresh_rate", getRefreshRate());
-		}
-		else
-		{
-			Log.i(TAG, "Refresh rate set to 59.95Hz (default).");	
+		} else {
+			Log.i(TAG, "Refresh rate set to 59.95Hz (default).");
 			config.setDouble("video_refresh_rate", 59.95);
 		}