Fixed bug 2816 - [patch] Android: Expose screen refresh rate
Jonas Kulla
Display::getRefreshRate() is available on all API levels.
--- a/android-project/src/org/libsdl/app/SDLActivity.java Sun Jan 18 02:50:14 2015 -0500
+++ b/android-project/src/org/libsdl/app/SDLActivity.java Fri Jan 23 20:29:08 2015 +0100
@@ -392,7 +392,7 @@
public static native void nativeQuit();
public static native void nativePause();
public static native void nativeResume();
- public static native void onNativeResize(int x, int y, int format);
+ public static native void onNativeResize(int x, int y, int format, float rate);
public static native int onNativePadDown(int device_id, int keycode);
public static native int onNativePadUp(int device_id, int keycode);
public static native void onNativeJoy(int device_id, int axis,
@@ -1041,7 +1041,7 @@
mWidth = width;
mHeight = height;
- SDLActivity.onNativeResize(width, height, sdlFormat);
+ SDLActivity.onNativeResize(width, height, sdlFormat, mDisplay.getRefreshRate());
Log.v("SDL", "Window size:" + width + "x"+height);
// Set mIsSurfaceReady to 'true' *before* making a call to handleResume
--- a/src/core/android/SDL_android.c Sun Jan 18 02:50:14 2015 -0500
+++ b/src/core/android/SDL_android.c Fri Jan 23 20:29:08 2015 +0100
@@ -143,9 +143,9 @@
/* Resize */
JNIEXPORT void JNICALL Java_org_libsdl_app_SDLActivity_onNativeResize(
JNIEnv* env, jclass jcls,
- jint width, jint height, jint format)
+ jint width, jint height, jint format, jfloat rate)
{
- Android_SetScreenResolution(width, height, format);
+ Android_SetScreenResolution(width, height, format, rate);
}
/* Paddown */
--- a/src/video/android/SDL_androidvideo.c Sun Jan 18 02:50:14 2015 -0500
+++ b/src/video/android/SDL_androidvideo.c Fri Jan 23 20:29:08 2015 +0100
@@ -64,6 +64,8 @@
int Android_ScreenWidth = 0;
int Android_ScreenHeight = 0;
Uint32 Android_ScreenFormat = SDL_PIXELFORMAT_UNKNOWN;
+int Android_ScreenRate = 0;
+
SDL_sem *Android_PauseSem = NULL, *Android_ResumeSem = NULL;
/* Currently only one window */
@@ -166,7 +168,7 @@
mode.format = Android_ScreenFormat;
mode.w = Android_ScreenWidth;
mode.h = Android_ScreenHeight;
- mode.refresh_rate = 0;
+ mode.refresh_rate = Android_ScreenRate;
mode.driverdata = NULL;
if (SDL_AddBasicVideoDisplay(&mode) < 0) {
return -1;
@@ -189,11 +191,12 @@
/* This function gets called before VideoInit() */
void
-Android_SetScreenResolution(int width, int height, Uint32 format)
+Android_SetScreenResolution(int width, int height, Uint32 format, float rate)
{
Android_ScreenWidth = width;
Android_ScreenHeight = height;
Android_ScreenFormat = format;
+ Android_ScreenRate = rate;
if (Android_Window) {
SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESIZED, width, height);
--- a/src/video/android/SDL_androidvideo.h Sun Jan 18 02:50:14 2015 -0500
+++ b/src/video/android/SDL_androidvideo.h Fri Jan 23 20:29:08 2015 +0100
@@ -28,7 +28,7 @@
#include "../SDL_sysvideo.h"
/* Called by the JNI layer when the screen changes size or format */
-extern void Android_SetScreenResolution(int width, int height, Uint32 format);
+extern void Android_SetScreenResolution(int width, int height, Uint32 format, float rate);
/* Private display data */