--- a/CMakeLists.txt Sat Jan 24 23:53:41 2015 -0400
+++ b/CMakeLists.txt Sat Jan 24 23:58:07 2015 -0400
@@ -1050,7 +1050,7 @@
endif()
if(SDL_AUDIO)
- set(MACOSX_COREAUDIO 1)
+ set(SDL_AUDIO_DRIVER_COREAUDIO 1)
file(GLOB AUDIO_SOURCES ${SDL2_SOURCE_DIR}/src/audio/coreaudio/*.c)
set(SOURCE_FILES ${SOURCE_FILES} ${AUDIO_SOURCES})
set(HAVE_SDL_AUDIO TRUE)
--- a/android-project/src/org/libsdl/app/SDLActivity.java Sat Jan 24 23:53:41 2015 -0400
+++ b/android-project/src/org/libsdl/app/SDLActivity.java Sat Jan 24 23:58:07 2015 -0400
@@ -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 Sat Jan 24 23:53:41 2015 -0400
+++ b/src/core/android/SDL_android.c Sat Jan 24 23:58:07 2015 -0400
@@ -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/joystick/haiku/SDL_haikujoystick.cc Sat Jan 24 23:53:41 2015 -0400
+++ b/src/joystick/haiku/SDL_haikujoystick.cc Sat Jan 24 23:58:07 2015 -0400
@@ -53,8 +53,7 @@
static int SDL_SYS_numjoysticks = 0;
/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks. Joystick 0 should be the system default joystick.
+ * Joystick 0 should be the system default joystick.
* It should return 0, or -1 on an unrecoverable fatal error.
*/
int SDL_SYS_JoystickInit(void)
--- a/src/joystick/iphoneos/SDL_sysjoystick.m Sat Jan 24 23:53:41 2015 -0400
+++ b/src/joystick/iphoneos/SDL_sysjoystick.m Sat Jan 24 23:58:07 2015 -0400
@@ -39,8 +39,7 @@
static int numjoysticks = 0;
/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks. Joystick 0 should be the system default joystick.
+ * Joystick 0 should be the system default joystick.
* It should return 0, or -1 on an unrecoverable fatal error.
*/
int
--- a/src/joystick/psp/SDL_sysjoystick.c Sat Jan 24 23:53:41 2015 -0400
+++ b/src/joystick/psp/SDL_sysjoystick.c Sat Jan 24 23:58:07 2015 -0400
@@ -97,16 +97,13 @@
/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks. Joystick 0 should be the system default joystick.
+ * Joystick 0 should be the system default joystick.
* It should return number of joysticks, or -1 on an unrecoverable fatal error.
*/
int SDL_SYS_JoystickInit(void)
{
int i;
-/* SDL_numjoysticks = 1; */
-
/* Setup input */
sceCtrlSetSamplingCycle(0);
sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
--- a/src/joystick/windows/SDL_mmjoystick.c Sat Jan 24 23:53:41 2015 -0400
+++ b/src/joystick/windows/SDL_mmjoystick.c Sat Jan 24 23:58:07 2015 -0400
@@ -143,8 +143,7 @@
static int SDL_SYS_numjoysticks = 0;
/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks. Joystick 0 should be the system default joystick.
+ * Joystick 0 should be the system default joystick.
* It should return 0, or -1 on an unrecoverable fatal error.
*/
int
--- a/src/joystick/windows/SDL_windowsjoystick.c Sat Jan 24 23:53:41 2015 -0400
+++ b/src/joystick/windows/SDL_windowsjoystick.c Sat Jan 24 23:58:07 2015 -0400
@@ -278,8 +278,7 @@
}
/* Function to scan the system for joysticks.
- * This function should set SDL_numjoysticks to the number of available
- * joysticks. Joystick 0 should be the system default joystick.
+ * Joystick 0 should be the system default joystick.
* It should return 0, or -1 on an unrecoverable fatal error.
*/
int
--- a/src/video/android/SDL_androidvideo.c Sat Jan 24 23:53:41 2015 -0400
+++ b/src/video/android/SDL_androidvideo.c Sat Jan 24 23:58:07 2015 -0400
@@ -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 Sat Jan 24 23:53:41 2015 -0400
+++ b/src/video/android/SDL_androidvideo.h Sat Jan 24 23:58:07 2015 -0400
@@ -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 */
--- a/test/testautomation_video.c Sat Jan 24 23:53:41 2015 -0400
+++ b/test/testautomation_video.c Sat Jan 24 23:58:07 2015 -0400
@@ -541,7 +541,6 @@
{
const char *invalidWindowError = "Invalid window";
char *lastError;
- const char* title = "video_getWindowBrightnessNegative Test Window";
float result;
/* Call against invalid window */
@@ -728,7 +727,6 @@
int
video_getWindowGammaRampNegative(void *arg)
{
- const char* title = "video_getWindowGammaRampNegative Test Window";
Uint16 red[256];
Uint16 green[256];
Uint16 blue[256];