mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 16:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Android: Remove useless getDisplayRefreshRate

Browse Source 
Interferes with detection in native activity.
This commit is contained in:
Themaister 2014-06-21 17:05:04 +02:00
parent e0736d8d90
commit 09443d88c2
2 changed files with 2 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
View File

@ -183,7 +183,7 @@ public final class UserPreferences
config.setInt("rewind_granularity", Integer.parseInt(prefs.getString("rewind_granularity", "1")));
config.setBoolean("video_vsync", prefs.getBoolean("video_vsync", true));
config.setBoolean("input_autodetect_enable", prefs.getBoolean("input_autodetect_enable", true));
config.setDouble("video_refresh_rate", getRefreshRate(ctx));
config.setString("video_refresh_rate", prefs.getString("video_refresh_rate", ""));
config.setBoolean("video_threaded", prefs.getBoolean("video_threaded", true));
// Refactor these weird values - 'full', 'auto', 'square', whatever -
@ -341,59 +341,6 @@ public final class UserPreferences
return PreferenceManager.getDefaultSharedPreferences(ctx);
}
/**
* Retrieves an approximate display refresh rate for a device.
* <p>
* Note that some devices will return completely wrong values
* with the {@link Display#getRefreshRate()} method, and so
* this method attempts to ballpark an appropriate value.
*
* @param ctx the current {@link Context}.
*
* @return an approximately correct display refresh rate for a device.
*/
private static double getRefreshRate(Context ctx)
{
double rate = 0;
SharedPreferences prefs = getPreferences(ctx);
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(ctx);
}
}
else
{
rate = getDisplayRefreshRate(ctx);
}
Log.i(TAG, "Using refresh rate: " + rate + " Hz.");
return rate;
}
// Utility function used with getRefreshRate.
private static double getDisplayRefreshRate(Context ctx)
{
// Android is *very* likely to screw this up.
// It is rarely a good value to use, so make sure it's not
// completely wrong. Some phones return refresh rates that are
// completely bogus
// (like 0.3 Hz, etc), so try to be very conservative here.
final WindowManager wm = (WindowManager) ctx.getSystemService(Context.WINDOW_SERVICE);
final Display display = wm.getDefaultDisplay();
double rate = display.getRefreshRate();
if (rate > 61.0 || rate < 58.0)
rate = 59.95;
return rate;
}
/**
* Gets the optimal sampling rate for low-latency audio playback.
*

6
frontend/platform/platform_android.c
View File

@ -595,13 +595,9 @@ static void frontend_android_get_environment_settings(int *argc, char *argv[],
else if (!strcmp(device_model, "GAMEMID_BT"))
g_defaults.settings.out_latency = 160;
else if (!strcmp(device_model, "SHIELD"))
{
g_defaults.settings.video_refresh_rate = 59.90;
}
g_defaults.settings.video_refresh_rate = 60.0;
else if (!strcmp(device_model, "JSS15J"))
{
g_defaults.settings.video_refresh_rate = 59.65;
}
// Explicitly disable input overlay by default for gamepad-like/console devices
if (device_is_game_console(device_model))