pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved warning about SDL_AndroidGetActivity to SDL_system.h

Browse source
This commit is contained in:
Gabriel Jacobo 2013-04-23 16:44:54 -03:00
parent 2b47360970
commit b1b1c1e2d1
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/SDL_system.h
View file

@ -62,6 +62,9 @@ extern DECLSPEC void * SDLCALL SDL_AndroidGetJNIEnv();
/* Get the SDL Activity object for the application /* Get the SDL Activity object for the application
This returns jobject, but the prototype is void* so we don't need jni.h This returns jobject, but the prototype is void* so we don't need jni.h
The jobject returned by SDL_AndroidGetActivity is a local reference.
It is the caller's responsibility to properly release it
(using LocalReferenceHolder or manually with env->DeleteLocalRef)
*/ */
extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity(); extern DECLSPEC void * SDLCALL SDL_AndroidGetActivity();

8
src/core/android/SDL_android.cpp
View file

@ -1130,14 +1130,12 @@ extern "C" void *SDL_AndroidGetJNIEnv()
return Android_JNI_GetEnv(); return Android_JNI_GetEnv();
} }
/*
* The jobject returned by SDL_AndroidGetActivity is a local reference.
* It is the caller's responsibility to properly release it
* (using LocalReferenceHolder or manually with env->DeleteLocalRef)
*/
extern "C" void *SDL_AndroidGetActivity() extern "C" void *SDL_AndroidGetActivity()
{ {
/* See SDL_system.h for caveats on using this function. */
jmethodID mid; jmethodID mid;
JNIEnv *env = Android_JNI_GetEnv(); JNIEnv *env = Android_JNI_GetEnv();