author | Gabriel Jacobo <gabomdq@gmail.com> |
Mon, 09 Jul 2012 18:08:06 -0300 | |
changeset 6354 | 17840f487124 |
parent 6335 | fbb84f5b985f |
child 6377 | 3d868ca4782f |
permissions | -rwxr-xr-x |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
1 |
/* |
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
2 |
Simple DirectMedia Layer |
6138 | 3 |
Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org> |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
4 |
|
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
5 |
This software is provided 'as-is', without any express or implied |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
6 |
warranty. In no event will the authors be held liable for any damages |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
7 |
arising from the use of this software. |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
8 |
|
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
9 |
Permission is granted to anyone to use this software for any purpose, |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
10 |
including commercial applications, and to alter it and redistribute it |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
11 |
freely, subject to the following restrictions: |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
12 |
|
5535
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
13 |
1. The origin of this software must not be misrepresented; you must not |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
14 |
claim that you wrote the original software. If you use this software |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
15 |
in a product, an acknowledgment in the product documentation would be |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
16 |
appreciated but is not required. |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
17 |
2. Altered source versions must be plainly marked as such, and must not be |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
18 |
misrepresented as being the original software. |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
19 |
3. This notice may not be removed or altered from any source distribution. |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
20 |
*/ |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
21 |
#include "SDL_config.h" |
5222
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
22 |
#include "SDL_stdinc.h" |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
23 |
#include "SDL_assert.h" |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
24 |
|
6044
35448a5ea044
Lots of fixes importing SDL source wholesale into a new iOS project
Sam Lantinga <slouken@libsdl.org>
parents:
5996
diff
changeset
|
25 |
#ifdef __ANDROID__ |
35448a5ea044
Lots of fixes importing SDL source wholesale into a new iOS project
Sam Lantinga <slouken@libsdl.org>
parents:
5996
diff
changeset
|
26 |
|
4989 | 27 |
#include "SDL_android.h" |
28 |
||
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
29 |
extern "C" { |
5092 | 30 |
#include "../../events/SDL_events_c.h" |
31 |
#include "../../video/android/SDL_androidkeyboard.h" |
|
32 |
#include "../../video/android/SDL_androidtouch.h" |
|
33 |
#include "../../video/android/SDL_androidvideo.h" |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
34 |
|
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
35 |
#include <android/log.h> |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
36 |
#include <pthread.h> |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
37 |
#define LOG_TAG "SDL_android" |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
38 |
//#define LOGI(...) __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__) |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
39 |
//#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__) |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
40 |
#define LOGI(...) do {} while (false) |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
41 |
#define LOGE(...) do {} while (false) |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
42 |
|
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
43 |
|
6191
2c0d35b1af4e
Made the application activity events consistent between iOS and Android
Sam Lantinga <slouken@libsdl.org>
parents:
6189
diff
changeset
|
44 |
/* Implemented in audio/android/SDL_androidaudio.c */ |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
45 |
extern void Android_RunAudioThread(); |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
46 |
} // C |
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
47 |
|
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
48 |
/******************************************************************************* |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
49 |
This file links the Java side of Android with libsdl |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
50 |
*******************************************************************************/ |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
51 |
#include <jni.h> |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
52 |
#include <android/log.h> |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
53 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
54 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
55 |
/******************************************************************************* |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
56 |
Globals |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
57 |
*******************************************************************************/ |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
58 |
static pthread_key_t mThreadKey; |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
59 |
static JavaVM* mJavaVM; |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
60 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
61 |
// Main activity |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
62 |
static jclass mActivityClass; |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
63 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
64 |
// method signatures |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
65 |
static jmethodID midCreateGLContext; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
66 |
static jmethodID midFlipBuffers; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
67 |
static jmethodID midAudioInit; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
68 |
static jmethodID midAudioWriteShortBuffer; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
69 |
static jmethodID midAudioWriteByteBuffer; |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
70 |
static jmethodID midAudioQuit; |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
71 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
72 |
// Accelerometer data storage |
5000
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
73 |
static float fLastAccelerometer[3]; |
6212
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
74 |
static bool bHasNewData; |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
75 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
76 |
/******************************************************************************* |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
77 |
Functions called by JNI |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
78 |
*******************************************************************************/ |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
79 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
80 |
// Library init |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
81 |
extern "C" jint JNI_OnLoad(JavaVM* vm, void* reserved) |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
82 |
{ |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
83 |
JNIEnv *env; |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
84 |
mJavaVM = vm; |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
85 |
LOGI("JNI_OnLoad called"); |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
86 |
if (mJavaVM->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) { |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
87 |
LOGE("Failed to get the environment using GetEnv()"); |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
88 |
return -1; |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
89 |
} |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
90 |
/* |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
91 |
* Create mThreadKey so we can keep track of the JNIEnv assigned to each thread |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
92 |
* Refer to http://developer.android.com/guide/practices/design/jni.html for the rationale behind this |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
93 |
*/ |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
94 |
if (pthread_key_create(&mThreadKey, Android_JNI_ThreadDestroyed)) { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
95 |
__android_log_print(ANDROID_LOG_ERROR, "SDL", "Error initializing pthread key"); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
96 |
} |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
97 |
else { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
98 |
Android_JNI_SetupThread(); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
99 |
} |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
100 |
|
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
101 |
return JNI_VERSION_1_4; |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
102 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
103 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
104 |
// Called before SDL_main() to initialize JNI bindings |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
105 |
extern "C" void SDL_Android_Init(JNIEnv* mEnv, jclass cls) |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
106 |
{ |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
107 |
__android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init()"); |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
108 |
|
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
109 |
Android_JNI_SetupThread(); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
110 |
|
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
111 |
mActivityClass = (jclass)mEnv->NewGlobalRef(cls); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
112 |
|
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
113 |
midCreateGLContext = mEnv->GetStaticMethodID(mActivityClass, |
5222
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
114 |
"createGLContext","(II)Z"); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
115 |
midFlipBuffers = mEnv->GetStaticMethodID(mActivityClass, |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
116 |
"flipBuffers","()V"); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
117 |
midAudioInit = mEnv->GetStaticMethodID(mActivityClass, |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
118 |
"audioInit", "(IZZI)Ljava/lang/Object;"); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
119 |
midAudioWriteShortBuffer = mEnv->GetStaticMethodID(mActivityClass, |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
120 |
"audioWriteShortBuffer", "([S)V"); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
121 |
midAudioWriteByteBuffer = mEnv->GetStaticMethodID(mActivityClass, |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
122 |
"audioWriteByteBuffer", "([B)V"); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
123 |
midAudioQuit = mEnv->GetStaticMethodID(mActivityClass, |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
124 |
"audioQuit", "()V"); |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
125 |
|
6212
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
126 |
bHasNewData = false; |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
127 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
128 |
if(!midCreateGLContext || !midFlipBuffers || !midAudioInit || |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
129 |
!midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
130 |
__android_log_print(ANDROID_LOG_WARN, "SDL", "SDL: Couldn't locate Java callbacks, check that they're named and typed correctly"); |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
131 |
} |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
132 |
__android_log_print(ANDROID_LOG_INFO, "SDL", "SDL_Android_Init() finished!"); |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
133 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
134 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
135 |
// Resize |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
136 |
extern "C" void Java_org_libsdl_app_SDLActivity_onNativeResize( |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
137 |
JNIEnv* env, jclass jcls, |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
138 |
jint width, jint height, jint format) |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
139 |
{ |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
140 |
Android_SetScreenResolution(width, height, format); |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
141 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
142 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
143 |
// Keydown |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
144 |
extern "C" void Java_org_libsdl_app_SDLActivity_onNativeKeyDown( |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
145 |
JNIEnv* env, jclass jcls, jint keycode) |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
146 |
{ |
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
147 |
Android_OnKeyDown(keycode); |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
148 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
149 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
150 |
// Keyup |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
151 |
extern "C" void Java_org_libsdl_app_SDLActivity_onNativeKeyUp( |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
152 |
JNIEnv* env, jclass jcls, jint keycode) |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
153 |
{ |
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
154 |
Android_OnKeyUp(keycode); |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
155 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
156 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
157 |
// Touch |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
158 |
extern "C" void Java_org_libsdl_app_SDLActivity_onNativeTouch( |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
159 |
JNIEnv* env, jclass jcls, |
5982
f324bd81b52c
Added support for multitouch on Android.
Ryan C. Gordon <icculus@icculus.org>
parents:
5860
diff
changeset
|
160 |
jint touch_device_id_in, jint pointer_finger_id_in, |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
161 |
jint action, jfloat x, jfloat y, jfloat p) |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
162 |
{ |
5982
f324bd81b52c
Added support for multitouch on Android.
Ryan C. Gordon <icculus@icculus.org>
parents:
5860
diff
changeset
|
163 |
Android_OnTouch(touch_device_id_in, pointer_finger_id_in, action, x, y, p); |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
164 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
165 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
166 |
// Accelerometer |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
167 |
extern "C" void Java_org_libsdl_app_SDLActivity_onNativeAccel( |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
168 |
JNIEnv* env, jclass jcls, |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
169 |
jfloat x, jfloat y, jfloat z) |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
170 |
{ |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
171 |
fLastAccelerometer[0] = x; |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
172 |
fLastAccelerometer[1] = y; |
6212
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
173 |
fLastAccelerometer[2] = z; |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
174 |
bHasNewData = true; |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
175 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
176 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
177 |
// Quit |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
178 |
extern "C" void Java_org_libsdl_app_SDLActivity_nativeQuit( |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
179 |
JNIEnv* env, jclass cls) |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
180 |
{ |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
181 |
// Inject a SDL_QUIT event |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
182 |
SDL_SendQuit(); |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
183 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
184 |
|
6186
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
185 |
// Pause |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
186 |
extern "C" void Java_org_libsdl_app_SDLActivity_nativePause( |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
187 |
JNIEnv* env, jclass cls) |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
188 |
{ |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
189 |
if (Android_Window) { |
6330
0fa55ca2efdd
Fixes #1422, restores GL context automatically under Android
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6308
diff
changeset
|
190 |
/* Signal the pause semaphore so the event loop knows to pause and (optionally) block itself */ |
0fa55ca2efdd
Fixes #1422, restores GL context automatically under Android
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6308
diff
changeset
|
191 |
if (!SDL_SemValue(Android_PauseSem)) SDL_SemPost(Android_PauseSem); |
6186
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
192 |
SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0); |
6191
2c0d35b1af4e
Made the application activity events consistent between iOS and Android
Sam Lantinga <slouken@libsdl.org>
parents:
6189
diff
changeset
|
193 |
SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_MINIMIZED, 0, 0); |
6186
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
194 |
} |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
195 |
} |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
196 |
|
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
197 |
// Resume |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
198 |
extern "C" void Java_org_libsdl_app_SDLActivity_nativeResume( |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
199 |
JNIEnv* env, jclass cls) |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
200 |
{ |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
201 |
if (Android_Window) { |
6330
0fa55ca2efdd
Fixes #1422, restores GL context automatically under Android
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6308
diff
changeset
|
202 |
/* Signal the resume semaphore so the event loop knows to resume and restore the GL Context |
0fa55ca2efdd
Fixes #1422, restores GL context automatically under Android
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6308
diff
changeset
|
203 |
* We can't restore the GL Context here because it needs to be done on the SDL main thread |
0fa55ca2efdd
Fixes #1422, restores GL context automatically under Android
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6308
diff
changeset
|
204 |
* and this function will be called from the Java thread instead. |
0fa55ca2efdd
Fixes #1422, restores GL context automatically under Android
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6308
diff
changeset
|
205 |
*/ |
0fa55ca2efdd
Fixes #1422, restores GL context automatically under Android
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6308
diff
changeset
|
206 |
if (!SDL_SemValue(Android_ResumeSem)) SDL_SemPost(Android_ResumeSem); |
6186
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
207 |
SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0); |
6191
2c0d35b1af4e
Made the application activity events consistent between iOS and Android
Sam Lantinga <slouken@libsdl.org>
parents:
6189
diff
changeset
|
208 |
SDL_SendWindowEvent(Android_Window, SDL_WINDOWEVENT_RESTORED, 0, 0); |
6186
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
209 |
} |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
210 |
} |
e565ac981de6
Fixed bug 1293 - [Android] Support Pause/Resume
Sam Lantinga <slouken@libsdl.org>
parents:
6138
diff
changeset
|
211 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
212 |
extern "C" void Java_org_libsdl_app_SDLActivity_nativeRunAudioThread( |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
213 |
JNIEnv* env, jclass cls) |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
214 |
{ |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
215 |
/* This is the audio thread, with a different environment */ |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
216 |
Android_JNI_SetupThread(); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
217 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
218 |
Android_RunAudioThread(); |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
219 |
} |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
220 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
221 |
|
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
222 |
/******************************************************************************* |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
223 |
Functions called by SDL into Java |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
224 |
*******************************************************************************/ |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
225 |
|
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
226 |
class LocalReferenceHolder |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
227 |
{ |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
228 |
private: |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
229 |
static int s_active; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
230 |
|
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
231 |
public: |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
232 |
static bool IsActive() { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
233 |
return s_active > 0; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
234 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
235 |
|
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
236 |
public: |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
237 |
LocalReferenceHolder() : m_env(NULL) { } |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
238 |
~LocalReferenceHolder() { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
239 |
if (m_env) { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
240 |
m_env->PopLocalFrame(NULL); |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
241 |
--s_active; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
242 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
243 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
244 |
|
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
245 |
bool init(JNIEnv *env, jint capacity = 16) { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
246 |
if (env->PushLocalFrame(capacity) < 0) { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
247 |
SDL_SetError("Failed to allocate enough JVM local references"); |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
248 |
return false; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
249 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
250 |
++s_active; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
251 |
m_env = env; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
252 |
return true; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
253 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
254 |
|
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
255 |
protected: |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
256 |
JNIEnv *m_env; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
257 |
}; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
258 |
int LocalReferenceHolder::s_active; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
259 |
|
5222
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
260 |
extern "C" SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion) |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
261 |
{ |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
262 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
5222
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
263 |
if (mEnv->CallStaticBooleanMethod(mActivityClass, midCreateGLContext, majorVersion, minorVersion)) { |
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
264 |
return SDL_TRUE; |
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
265 |
} else { |
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
266 |
return SDL_FALSE; |
c66b2a778b7e
Try to create an OpenGL ES 2.0 context on Android and successfully fall back to OpenGL ES 1.1 if that fails.
Sam Lantinga <slouken@libsdl.org>
parents:
5092
diff
changeset
|
267 |
} |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
268 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
269 |
|
4989 | 270 |
extern "C" void Android_JNI_SwapWindow() |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
271 |
{ |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
272 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
273 |
mEnv->CallStaticVoidMethod(mActivityClass, midFlipBuffers); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
274 |
} |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
275 |
|
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
276 |
extern "C" void Android_JNI_SetActivityTitle(const char *title) |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
277 |
{ |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
278 |
jmethodID mid; |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
279 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
280 |
mid = mEnv->GetStaticMethodID(mActivityClass,"setActivityTitle","(Ljava/lang/String;)V"); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
281 |
if (mid) { |
6307
6048116f40b1
Fix for issue #1465, Leak in Android_JNI_SetActivityTitle (SDL_SetWindowTitle)
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6284
diff
changeset
|
282 |
jstring jtitle = reinterpret_cast<jstring>(mEnv->NewStringUTF(title)); |
6048116f40b1
Fix for issue #1465, Leak in Android_JNI_SetActivityTitle (SDL_SetWindowTitle)
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6284
diff
changeset
|
283 |
mEnv->CallStaticVoidMethod(mActivityClass, mid, jtitle); |
6048116f40b1
Fix for issue #1465, Leak in Android_JNI_SetActivityTitle (SDL_SetWindowTitle)
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6284
diff
changeset
|
284 |
mEnv->DeleteLocalRef(jtitle); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
285 |
} |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
286 |
} |
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
287 |
|
6212
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
288 |
extern "C" SDL_bool Android_JNI_GetAccelerometerValues(float values[3]) |
5000
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
289 |
{ |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
290 |
int i; |
6212
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
291 |
SDL_bool retval = SDL_FALSE; |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
292 |
|
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
293 |
if (bHasNewData) { |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
294 |
for (i = 0; i < 3; ++i) { |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
295 |
values[i] = fLastAccelerometer[i]; |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
296 |
} |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
297 |
bHasNewData = false; |
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
298 |
retval = SDL_TRUE; |
5000
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
299 |
} |
6212
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
300 |
|
78d854de3a66
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop
Sam Lantinga <slouken@libsdl.org>
parents:
6191
diff
changeset
|
301 |
return retval; |
5000
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
302 |
} |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
303 |
|
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
304 |
static void Android_JNI_ThreadDestroyed(void* value) { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
305 |
/* The thread is being destroyed, detach it from the Java VM and set the mThreadKey value to NULL as required */ |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
306 |
JNIEnv *env = (JNIEnv*) value; |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
307 |
if (env != NULL) { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
308 |
mJavaVM->DetachCurrentThread(); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
309 |
pthread_setspecific(mThreadKey, NULL); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
310 |
} |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
311 |
} |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
312 |
|
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
313 |
JNIEnv* Android_JNI_GetEnv(void) { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
314 |
/* From http://developer.android.com/guide/practices/jni.html |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
315 |
* All threads are Linux threads, scheduled by the kernel. |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
316 |
* They're usually started from managed code (using Thread.start), but they can also be created elsewhere and then |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
317 |
* attached to the JavaVM. For example, a thread started with pthread_create can be attached with the |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
318 |
* JNI AttachCurrentThread or AttachCurrentThreadAsDaemon functions. Until a thread is attached, it has no JNIEnv, |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
319 |
* and cannot make JNI calls. |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
320 |
* Attaching a natively-created thread causes a java.lang.Thread object to be constructed and added to the "main" |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
321 |
* ThreadGroup, making it visible to the debugger. Calling AttachCurrentThread on an already-attached thread |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
322 |
* is a no-op. |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
323 |
* Note: You can call this function any number of times for the same thread, there's no harm in it |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
324 |
*/ |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
325 |
|
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
326 |
JNIEnv *env; |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
327 |
int status = mJavaVM->AttachCurrentThread(&env, NULL); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
328 |
if(status < 0) { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
329 |
LOGE("failed to attach current thread"); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
330 |
return 0; |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
331 |
} |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
332 |
|
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
333 |
return env; |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
334 |
} |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
335 |
|
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
336 |
int Android_JNI_SetupThread(void) { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
337 |
/* From http://developer.android.com/guide/practices/jni.html |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
338 |
* Threads attached through JNI must call DetachCurrentThread before they exit. If coding this directly is awkward, |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
339 |
* in Android 2.0 (Eclair) and higher you can use pthread_key_create to define a destructor function that will be |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
340 |
* called before the thread exits, and call DetachCurrentThread from there. (Use that key with pthread_setspecific |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
341 |
* to store the JNIEnv in thread-local-storage; that way it'll be passed into your destructor as the argument.) |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
342 |
* Note: The destructor is not called unless the stored value is != NULL |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
343 |
* Note: You can call this function any number of times for the same thread, there's no harm in it |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
344 |
* (except for some lost CPU cycles) |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
345 |
*/ |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
346 |
JNIEnv *env = Android_JNI_GetEnv(); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
347 |
pthread_setspecific(mThreadKey, (void*) env); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
348 |
return 1; |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
349 |
} |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
350 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
351 |
// |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
352 |
// Audio support |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
353 |
// |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
354 |
static jboolean audioBuffer16Bit = JNI_FALSE; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
355 |
static jboolean audioBufferStereo = JNI_FALSE; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
356 |
static jobject audioBuffer = NULL; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
357 |
static void* audioBufferPinned = NULL; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
358 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
359 |
extern "C" int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames) |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
360 |
{ |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
361 |
int audioBufferFrames; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
362 |
|
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
363 |
int status; |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
364 |
JNIEnv *env = Android_JNI_GetEnv(); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
365 |
|
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
366 |
if (!env) { |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
367 |
LOGE("callback_handler: failed to attach current thread"); |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
368 |
} |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
369 |
Android_JNI_SetupThread(); |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
370 |
|
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
371 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
372 |
__android_log_print(ANDROID_LOG_VERBOSE, "SDL", "SDL audio: opening device"); |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
373 |
audioBuffer16Bit = is16Bit; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
374 |
audioBufferStereo = channelCount > 1; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
375 |
|
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
376 |
audioBuffer = env->CallStaticObjectMethod(mActivityClass, midAudioInit, sampleRate, audioBuffer16Bit, audioBufferStereo, desiredBufferFrames); |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
377 |
|
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
378 |
if (audioBuffer == NULL) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
379 |
__android_log_print(ANDROID_LOG_WARN, "SDL", "SDL audio: didn't get back a good audio buffer!"); |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
380 |
return 0; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
381 |
} |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
382 |
audioBuffer = env->NewGlobalRef(audioBuffer); |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
383 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
384 |
jboolean isCopy = JNI_FALSE; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
385 |
if (audioBuffer16Bit) { |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
386 |
audioBufferPinned = env->GetShortArrayElements((jshortArray)audioBuffer, &isCopy); |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
387 |
audioBufferFrames = env->GetArrayLength((jshortArray)audioBuffer); |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
388 |
} else { |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
389 |
audioBufferPinned = env->GetByteArrayElements((jbyteArray)audioBuffer, &isCopy); |
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
390 |
audioBufferFrames = env->GetArrayLength((jbyteArray)audioBuffer); |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
391 |
} |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
392 |
if (audioBufferStereo) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
393 |
audioBufferFrames /= 2; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
394 |
} |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
395 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
396 |
return audioBufferFrames; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
397 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
398 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
399 |
extern "C" void * Android_JNI_GetAudioBuffer() |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
400 |
{ |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
401 |
return audioBufferPinned; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
402 |
} |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
403 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
404 |
extern "C" void Android_JNI_WriteAudioBuffer() |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
405 |
{ |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
406 |
JNIEnv *mAudioEnv = Android_JNI_GetEnv(); |
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
407 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
408 |
if (audioBuffer16Bit) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
409 |
mAudioEnv->ReleaseShortArrayElements((jshortArray)audioBuffer, (jshort *)audioBufferPinned, JNI_COMMIT); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
410 |
mAudioEnv->CallStaticVoidMethod(mActivityClass, midAudioWriteShortBuffer, (jshortArray)audioBuffer); |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
411 |
} else { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
412 |
mAudioEnv->ReleaseByteArrayElements((jbyteArray)audioBuffer, (jbyte *)audioBufferPinned, JNI_COMMIT); |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
413 |
mAudioEnv->CallStaticVoidMethod(mActivityClass, midAudioWriteByteBuffer, (jbyteArray)audioBuffer); |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
414 |
} |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
415 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
416 |
/* JNI_COMMIT means the changes are committed to the VM but the buffer remains pinned */ |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
417 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
418 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
419 |
extern "C" void Android_JNI_CloseAudioDevice() |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
420 |
{ |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
421 |
int status; |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
422 |
JNIEnv *env = Android_JNI_GetEnv(); |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
423 |
|
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
424 |
env->CallStaticVoidMethod(mActivityClass, midAudioQuit); |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
425 |
|
4997
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
426 |
if (audioBuffer) { |
5996
102a9ec1ea13
Don't use a global JNIEnv across threads; it's not thread safe.
Ryan C. Gordon <icculus@icculus.org>
parents:
5994
diff
changeset
|
427 |
env->DeleteGlobalRef(audioBuffer); |
4997
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
428 |
audioBuffer = NULL; |
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
429 |
audioBufferPinned = NULL; |
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
430 |
} |
4964
6c645018741e
Build the SDL library as a shared object on Android, so it will work correctly with SDL_image and SDL_ttf.
Sam Lantinga <slouken@libsdl.org>
parents:
diff
changeset
|
431 |
} |
4981
55b82067815b
Fill in the video mode with the correct screen format
Sam Lantinga <slouken@libsdl.org>
parents:
4980
diff
changeset
|
432 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
433 |
// Test for an exception and call SDL_SetError with its detail if one occurs |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
434 |
static bool Android_JNI_ExceptionOccurred() |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
435 |
{ |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
436 |
SDL_assert(LocalReferenceHolder::IsActive()); |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
437 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
438 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
439 |
jthrowable exception = mEnv->ExceptionOccurred(); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
440 |
if (exception != NULL) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
441 |
jmethodID mid; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
442 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
443 |
// Until this happens most JNI operations have undefined behaviour |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
444 |
mEnv->ExceptionClear(); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
445 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
446 |
jclass exceptionClass = mEnv->GetObjectClass(exception); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
447 |
jclass classClass = mEnv->FindClass("java/lang/Class"); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
448 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
449 |
mid = mEnv->GetMethodID(classClass, "getName", "()Ljava/lang/String;"); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
450 |
jstring exceptionName = (jstring)mEnv->CallObjectMethod(exceptionClass, mid); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
451 |
const char* exceptionNameUTF8 = mEnv->GetStringUTFChars(exceptionName, 0); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
452 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
453 |
mid = mEnv->GetMethodID(exceptionClass, "getMessage", "()Ljava/lang/String;"); |
5860
b89f7f3bc9be
Called method on wrong object in Android exception handler.
Ryan C. Gordon <icculus@icculus.org>
parents:
5650
diff
changeset
|
454 |
jstring exceptionMessage = (jstring)mEnv->CallObjectMethod(exception, mid); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
455 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
456 |
if (exceptionMessage != NULL) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
457 |
const char* exceptionMessageUTF8 = mEnv->GetStringUTFChars( |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
458 |
exceptionMessage, 0); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
459 |
SDL_SetError("%s: %s", exceptionNameUTF8, exceptionMessageUTF8); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
460 |
mEnv->ReleaseStringUTFChars(exceptionMessage, exceptionMessageUTF8); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
461 |
} else { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
462 |
SDL_SetError("%s", exceptionNameUTF8); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
463 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
464 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
465 |
mEnv->ReleaseStringUTFChars(exceptionName, exceptionNameUTF8); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
466 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
467 |
return true; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
468 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
469 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
470 |
return false; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
471 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
472 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
473 |
static int Android_JNI_FileOpen(SDL_RWops* ctx) |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
474 |
{ |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
475 |
LocalReferenceHolder refs; |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
476 |
int result = 0; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
477 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
478 |
jmethodID mid; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
479 |
jobject context; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
480 |
jobject assetManager; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
481 |
jobject inputStream; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
482 |
jclass channels; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
483 |
jobject readableByteChannel; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
484 |
jstring fileNameJString; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
485 |
|
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
486 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
487 |
if (!refs.init(mEnv)) { |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
488 |
goto failure; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
489 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
490 |
|
6308
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
491 |
fileNameJString = (jstring)ctx->hidden.androidio.fileNameRef; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
492 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
493 |
// context = SDLActivity.getContext(); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
494 |
mid = mEnv->GetStaticMethodID(mActivityClass, |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
495 |
"getContext","()Landroid/content/Context;"); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
496 |
context = mEnv->CallStaticObjectMethod(mActivityClass, mid); |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
497 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
498 |
// assetManager = context.getAssets(); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
499 |
mid = mEnv->GetMethodID(mEnv->GetObjectClass(context), |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
500 |
"getAssets", "()Landroid/content/res/AssetManager;"); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
501 |
assetManager = mEnv->CallObjectMethod(context, mid); |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
502 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
503 |
// inputStream = assetManager.open(<filename>); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
504 |
mid = mEnv->GetMethodID(mEnv->GetObjectClass(assetManager), |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
505 |
"open", "(Ljava/lang/String;)Ljava/io/InputStream;"); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
506 |
inputStream = mEnv->CallObjectMethod(assetManager, mid, fileNameJString); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
507 |
if (Android_JNI_ExceptionOccurred()) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
508 |
goto failure; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
509 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
510 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
511 |
ctx->hidden.androidio.inputStreamRef = mEnv->NewGlobalRef(inputStream); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
512 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
513 |
// Despite all the visible documentation on [Asset]InputStream claiming |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
514 |
// that the .available() method is not guaranteed to return the entire file |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
515 |
// size, comments in <sdk>/samples/<ver>/ApiDemos/src/com/example/ ... |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
516 |
// android/apis/content/ReadAsset.java imply that Android's |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
517 |
// AssetInputStream.available() /will/ always return the total file size |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
518 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
519 |
// size = inputStream.available(); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
520 |
mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
521 |
"available", "()I"); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
522 |
ctx->hidden.androidio.size = mEnv->CallIntMethod(inputStream, mid); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
523 |
if (Android_JNI_ExceptionOccurred()) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
524 |
goto failure; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
525 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
526 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
527 |
// readableByteChannel = Channels.newChannel(inputStream); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
528 |
channels = mEnv->FindClass("java/nio/channels/Channels"); |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
529 |
mid = mEnv->GetStaticMethodID(channels, |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
530 |
"newChannel", |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
531 |
"(Ljava/io/InputStream;)Ljava/nio/channels/ReadableByteChannel;"); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
532 |
readableByteChannel = mEnv->CallStaticObjectMethod( |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
533 |
channels, mid, inputStream); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
534 |
if (Android_JNI_ExceptionOccurred()) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
535 |
goto failure; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
536 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
537 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
538 |
ctx->hidden.androidio.readableByteChannelRef = |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
539 |
mEnv->NewGlobalRef(readableByteChannel); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
540 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
541 |
// Store .read id for reading purposes |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
542 |
mid = mEnv->GetMethodID(mEnv->GetObjectClass(readableByteChannel), |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
543 |
"read", "(Ljava/nio/ByteBuffer;)I"); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
544 |
ctx->hidden.androidio.readMethod = mid; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
545 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
546 |
ctx->hidden.androidio.position = 0; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
547 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
548 |
if (false) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
549 |
failure: |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
550 |
result = -1; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
551 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
552 |
mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.fileNameRef); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
553 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
554 |
if(ctx->hidden.androidio.inputStreamRef != NULL) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
555 |
mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.inputStreamRef); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
556 |
} |
6308
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
557 |
|
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
558 |
if(ctx->hidden.androidio.readableByteChannelRef != NULL) { |
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
559 |
mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.readableByteChannelRef); |
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
560 |
} |
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
561 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
562 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
563 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
564 |
return result; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
565 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
566 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
567 |
extern "C" int Android_JNI_FileOpen(SDL_RWops* ctx, |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
568 |
const char* fileName, const char*) |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
569 |
{ |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
570 |
LocalReferenceHolder refs; |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
571 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
572 |
|
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
573 |
if (!refs.init(mEnv)) { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
574 |
return -1; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
575 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
576 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
577 |
if (!ctx) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
578 |
return -1; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
579 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
580 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
581 |
jstring fileNameJString = mEnv->NewStringUTF(fileName); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
582 |
ctx->hidden.androidio.fileNameRef = mEnv->NewGlobalRef(fileNameJString); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
583 |
ctx->hidden.androidio.inputStreamRef = NULL; |
6335
fbb84f5b985f
Fixes #1519, adds initialization to Android RWops internal variables.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6330
diff
changeset
|
584 |
ctx->hidden.androidio.readableByteChannelRef = NULL; |
fbb84f5b985f
Fixes #1519, adds initialization to Android RWops internal variables.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6330
diff
changeset
|
585 |
ctx->hidden.androidio.readMethod = NULL; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
586 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
587 |
return Android_JNI_FileOpen(ctx); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
588 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
589 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
590 |
extern "C" size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
591 |
size_t size, size_t maxnum) |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
592 |
{ |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
593 |
LocalReferenceHolder refs; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
594 |
int bytesRemaining = size * maxnum; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
595 |
int bytesRead = 0; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
596 |
|
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
597 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
598 |
if (!refs.init(mEnv)) { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
599 |
return -1; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
600 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
601 |
|
6308
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
602 |
jobject readableByteChannel = (jobject)ctx->hidden.androidio.readableByteChannelRef; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
603 |
jmethodID readMethod = (jmethodID)ctx->hidden.androidio.readMethod; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
604 |
jobject byteBuffer = mEnv->NewDirectByteBuffer(buffer, bytesRemaining); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
605 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
606 |
while (bytesRemaining > 0) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
607 |
// result = readableByteChannel.read(...); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
608 |
int result = mEnv->CallIntMethod(readableByteChannel, readMethod, byteBuffer); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
609 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
610 |
if (Android_JNI_ExceptionOccurred()) { |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
611 |
return 0; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
612 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
613 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
614 |
if (result < 0) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
615 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
616 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
617 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
618 |
bytesRemaining -= result; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
619 |
bytesRead += result; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
620 |
ctx->hidden.androidio.position += result; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
621 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
622 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
623 |
return bytesRead / size; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
624 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
625 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
626 |
extern "C" size_t Android_JNI_FileWrite(SDL_RWops* ctx, const void* buffer, |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
627 |
size_t size, size_t num) |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
628 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
629 |
SDL_SetError("Cannot write to Android package filesystem"); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
630 |
return 0; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
631 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
632 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
633 |
static int Android_JNI_FileClose(SDL_RWops* ctx, bool release) |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
634 |
{ |
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
635 |
LocalReferenceHolder refs; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
636 |
int result = 0; |
6354
17840f487124
Fixes #1422, removes global JNI Env, uses per thread copies, adds thread auto detaching.
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6335
diff
changeset
|
637 |
JNIEnv *mEnv = Android_JNI_GetEnv(); |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
638 |
|
6284
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
639 |
if (!refs.init(mEnv)) { |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
640 |
SDL_SetError("Failed to allocate enough JVM local references"); |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
641 |
return -1; |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
642 |
} |
1893d507ba42
Fixed bug 1417 - Android_JNI_FileClose local reference bug
Sam Lantinga <slouken@libsdl.org>
parents:
6212
diff
changeset
|
643 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
644 |
if (ctx) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
645 |
if (release) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
646 |
mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.fileNameRef); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
647 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
648 |
|
6308
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
649 |
jobject inputStream = (jobject)ctx->hidden.androidio.inputStreamRef; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
650 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
651 |
// inputStream.close(); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
652 |
jmethodID mid = mEnv->GetMethodID(mEnv->GetObjectClass(inputStream), |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
653 |
"close", "()V"); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
654 |
mEnv->CallVoidMethod(inputStream, mid); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
655 |
mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.inputStreamRef); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
656 |
mEnv->DeleteGlobalRef((jobject)ctx->hidden.androidio.readableByteChannelRef); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
657 |
if (Android_JNI_ExceptionOccurred()) { |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
658 |
result = -1; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
659 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
660 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
661 |
if (release) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
662 |
SDL_FreeRW(ctx); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
663 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
664 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
665 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
666 |
return result; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
667 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
668 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
669 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
670 |
extern "C" long Android_JNI_FileSeek(SDL_RWops* ctx, long offset, int whence) |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
671 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
672 |
long newPosition; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
673 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
674 |
switch (whence) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
675 |
case RW_SEEK_SET: |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
676 |
newPosition = offset; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
677 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
678 |
case RW_SEEK_CUR: |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
679 |
newPosition = ctx->hidden.androidio.position + offset; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
680 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
681 |
case RW_SEEK_END: |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
682 |
newPosition = ctx->hidden.androidio.size + offset; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
683 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
684 |
default: |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
685 |
SDL_SetError("Unknown value for 'whence'"); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
686 |
return -1; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
687 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
688 |
if (newPosition < 0) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
689 |
newPosition = 0; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
690 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
691 |
if (newPosition > ctx->hidden.androidio.size) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
692 |
newPosition = ctx->hidden.androidio.size; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
693 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
694 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
695 |
long movement = newPosition - ctx->hidden.androidio.position; |
6308
263e2c049c22
Fixes issue #1500 "SDL_RWops fails under Android 4" by removing stale Local Refs
Gabriel Jacobo <gabomdq@gmail.com>
parents:
6307
diff
changeset
|
696 |
jobject inputStream = (jobject)ctx->hidden.androidio.inputStreamRef; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
697 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
698 |
if (movement > 0) { |
5993
c9cb52d6d864
* Android's InputStream::skip is apparently buggy, so instead read into a dummy buffer
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5982
diff
changeset
|
699 |
unsigned char buffer[1024]; |
c9cb52d6d864
* Android's InputStream::skip is apparently buggy, so instead read into a dummy buffer
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5982
diff
changeset
|
700 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
701 |
// The easy case where we're seeking forwards |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
702 |
while (movement > 0) { |
5994
153d15ab3032
Removed STL dependency in Android code.
Ryan C. Gordon <icculus@icculus.org>
parents:
5993
diff
changeset
|
703 |
long amount = (long) sizeof (buffer); |
153d15ab3032
Removed STL dependency in Android code.
Ryan C. Gordon <icculus@icculus.org>
parents:
5993
diff
changeset
|
704 |
if (amount > movement) { |
153d15ab3032
Removed STL dependency in Android code.
Ryan C. Gordon <icculus@icculus.org>
parents:
5993
diff
changeset
|
705 |
amount = movement; |
153d15ab3032
Removed STL dependency in Android code.
Ryan C. Gordon <icculus@icculus.org>
parents:
5993
diff
changeset
|
706 |
} |
153d15ab3032
Removed STL dependency in Android code.
Ryan C. Gordon <icculus@icculus.org>
parents:
5993
diff
changeset
|
707 |
size_t result = Android_JNI_FileRead(ctx, buffer, 1, amount); |
5993
c9cb52d6d864
* Android's InputStream::skip is apparently buggy, so instead read into a dummy buffer
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5982
diff
changeset
|
708 |
|
c9cb52d6d864
* Android's InputStream::skip is apparently buggy, so instead read into a dummy buffer
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5982
diff
changeset
|
709 |
if (result <= 0) { |
c9cb52d6d864
* Android's InputStream::skip is apparently buggy, so instead read into a dummy buffer
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5982
diff
changeset
|
710 |
// Failed to read/skip the required amount, so fail |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
711 |
return -1; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
712 |
} |
5993
c9cb52d6d864
* Android's InputStream::skip is apparently buggy, so instead read into a dummy buffer
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5982
diff
changeset
|
713 |
|
c9cb52d6d864
* Android's InputStream::skip is apparently buggy, so instead read into a dummy buffer
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5982
diff
changeset
|
714 |
movement -= result; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
715 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
716 |
} else if (movement < 0) { |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
717 |
// We can't seek backwards so we have to reopen the file and seek |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
718 |
// forwards which obviously isn't very efficient |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
719 |
Android_JNI_FileClose(ctx, false); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
720 |
Android_JNI_FileOpen(ctx); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
721 |
Android_JNI_FileSeek(ctx, newPosition, RW_SEEK_SET); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
722 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
723 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
724 |
ctx->hidden.androidio.position = newPosition; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
725 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
726 |
return ctx->hidden.androidio.position; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
727 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
728 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
729 |
extern "C" int Android_JNI_FileClose(SDL_RWops* ctx) |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
730 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
731 |
return Android_JNI_FileClose(ctx, true); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
732 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
733 |
|
6044
35448a5ea044
Lots of fixes importing SDL source wholesale into a new iOS project
Sam Lantinga <slouken@libsdl.org>
parents:
5996
diff
changeset
|
734 |
#endif /* __ANDROID__ */ |
35448a5ea044
Lots of fixes importing SDL source wholesale into a new iOS project
Sam Lantinga <slouken@libsdl.org>
parents:
5996
diff
changeset
|
735 |
|
4981
55b82067815b
Fill in the video mode with the correct screen format
Sam Lantinga <slouken@libsdl.org>
parents:
4980
diff
changeset
|
736 |
/* vi: set ts=4 sw=4 expandtab: */ |