author | Tim Angus <tim@blackcompanystudios.co.uk> |
Fri, 26 Aug 2011 13:11:53 +0100 | |
changeset 5650 | 640c67302f8e |
parent 5582 | 1281a3f1f0a6 |
child 5860 | b89f7f3bc9be |
permissions | -rw-r--r-- |
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 |
96594ac5fd1a
SDL 1.3 is now under the zlib license.
Sam Lantinga <slouken@libsdl.org>
parents:
5262
diff
changeset
|
3 |
Copyright (C) 1997-2011 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" |
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
|
23 |
|
4989 | 24 |
#include "SDL_android.h" |
25 |
||
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
26 |
extern "C" { |
5092 | 27 |
#include "../../events/SDL_events_c.h" |
28 |
#include "../../video/android/SDL_androidkeyboard.h" |
|
29 |
#include "../../video/android/SDL_androidtouch.h" |
|
30 |
#include "../../video/android/SDL_androidvideo.h" |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
31 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
32 |
/* Impelemented in audio/android/SDL_androidaudio.c */ |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
33 |
extern void Android_RunAudioThread(); |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
34 |
} // C |
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
35 |
|
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
|
36 |
/******************************************************************************* |
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
|
37 |
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
|
38 |
*******************************************************************************/ |
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
|
39 |
#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
|
40 |
#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
|
41 |
|
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
|
42 |
|
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
|
43 |
/******************************************************************************* |
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
|
44 |
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
|
45 |
*******************************************************************************/ |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
46 |
static JNIEnv* mEnv = NULL; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
47 |
static JNIEnv* mAudioEnv = NULL; |
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 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
49 |
// 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
|
50 |
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
|
51 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
52 |
// method signatures |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
53 |
static jmethodID midCreateGLContext; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
54 |
static jmethodID midFlipBuffers; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
55 |
static jmethodID midAudioInit; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
56 |
static jmethodID midAudioWriteShortBuffer; |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
57 |
static jmethodID midAudioWriteByteBuffer; |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
58 |
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
|
59 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
60 |
// Accelerometer data storage |
5000
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
61 |
static float fLastAccelerometer[3]; |
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
|
62 |
|
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 |
|
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
|
64 |
/******************************************************************************* |
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
|
65 |
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
|
66 |
*******************************************************************************/ |
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
|
67 |
|
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
|
68 |
// 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
|
69 |
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
|
70 |
{ |
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 |
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
|
72 |
} |
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
|
73 |
|
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
|
74 |
// Called before SDL_main() to initialize JNI bindings |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
75 |
extern "C" void SDL_Android_Init(JNIEnv* env, 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
|
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 |
__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
|
78 |
|
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
79 |
mEnv = env; |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
80 |
mActivityClass = cls; |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
81 |
|
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
82 |
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
|
83 |
"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
|
84 |
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
|
85 |
"flipBuffers","()V"); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
86 |
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
|
87 |
"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
|
88 |
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
|
89 |
"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
|
90 |
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
|
91 |
"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
|
92 |
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
|
93 |
"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
|
94 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
95 |
if(!midCreateGLContext || !midFlipBuffers || !midAudioInit || |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
96 |
!midAudioWriteShortBuffer || !midAudioWriteByteBuffer || !midAudioQuit) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
97 |
__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
|
98 |
} |
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
|
99 |
} |
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
|
100 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
101 |
// Resize |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
102 |
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
|
103 |
JNIEnv* env, jclass jcls, |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
104 |
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
|
105 |
{ |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
106 |
Android_SetScreenResolution(width, height, format); |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
107 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
108 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
109 |
// Keydown |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
110 |
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
|
111 |
JNIEnv* env, jclass jcls, jint keycode) |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
112 |
{ |
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
113 |
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
|
114 |
} |
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
|
115 |
|
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
|
116 |
// Keyup |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
117 |
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
|
118 |
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
|
119 |
{ |
4980
d9fdff945ec9
A bit of cleanup in the Android driver
Sam Lantinga <slouken@libsdl.org>
parents:
4964
diff
changeset
|
120 |
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
|
121 |
} |
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
|
122 |
|
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
|
123 |
// Touch |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
124 |
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
|
125 |
JNIEnv* env, jclass jcls, |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
126 |
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
|
127 |
{ |
5001
77df56570442
Added "mouse" support for the Android touch screen
Sam Lantinga <slouken@libsdl.org>
parents:
5000
diff
changeset
|
128 |
Android_OnTouch(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
|
129 |
} |
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
|
130 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
131 |
// 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
|
132 |
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
|
133 |
JNIEnv* env, jclass jcls, |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
134 |
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
|
135 |
{ |
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
|
136 |
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
|
137 |
fLastAccelerometer[1] = y; |
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
|
138 |
fLastAccelerometer[2] = z; |
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 |
} |
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
|
140 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
141 |
// Quit |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
142 |
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
|
143 |
JNIEnv* env, jclass cls) |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
144 |
{ |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
145 |
// Inject a SDL_QUIT event |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
146 |
SDL_SendQuit(); |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
147 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
148 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
149 |
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
|
150 |
JNIEnv* env, jclass cls) |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
151 |
{ |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
152 |
/* This is the audio thread, with a different environment */ |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
153 |
mAudioEnv = env; |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
154 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
155 |
Android_RunAudioThread(); |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
156 |
} |
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
|
157 |
|
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
|
158 |
|
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
|
159 |
/******************************************************************************* |
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
|
160 |
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
|
161 |
*******************************************************************************/ |
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
|
162 |
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
|
163 |
{ |
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
|
164 |
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
|
165 |
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
|
166 |
} 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
|
167 |
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
|
168 |
} |
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
|
169 |
} |
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 |
|
4989 | 171 |
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
|
172 |
{ |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
173 |
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
|
174 |
} |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
175 |
|
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
176 |
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
|
177 |
{ |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
178 |
jmethodID mid; |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
179 |
|
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
180 |
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
|
181 |
if (mid) { |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
182 |
mEnv->CallStaticVoidMethod(mActivityClass, mid, mEnv->NewStringUTF(title)); |
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
183 |
} |
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
|
184 |
} |
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
|
185 |
|
5000
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
186 |
extern "C" void Android_JNI_GetAccelerometerValues(float values[3]) |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
187 |
{ |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
188 |
int i; |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
189 |
for (i = 0; i < 3; ++i) { |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
190 |
values[i] = fLastAccelerometer[i]; |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
191 |
} |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
192 |
} |
6a10693e66c3
Cleaned up internal accelerometer interface
Sam Lantinga <slouken@libsdl.org>
parents:
4998
diff
changeset
|
193 |
|
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
194 |
// |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
195 |
// Audio support |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
196 |
// |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
197 |
static jboolean audioBuffer16Bit = JNI_FALSE; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
198 |
static jboolean audioBufferStereo = JNI_FALSE; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
199 |
static jobject audioBuffer = NULL; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
200 |
static void* audioBufferPinned = NULL; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
201 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
202 |
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
|
203 |
{ |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
204 |
int audioBufferFrames; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
205 |
|
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
206 |
__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
|
207 |
audioBuffer16Bit = is16Bit; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
208 |
audioBufferStereo = channelCount > 1; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
209 |
|
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
210 |
audioBuffer = mEnv->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
|
211 |
|
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
212 |
if (audioBuffer == NULL) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
213 |
__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
|
214 |
return 0; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
215 |
} |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
216 |
audioBuffer = mEnv->NewGlobalRef(audioBuffer); |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
217 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
218 |
jboolean isCopy = JNI_FALSE; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
219 |
if (audioBuffer16Bit) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
220 |
audioBufferPinned = mEnv->GetShortArrayElements((jshortArray)audioBuffer, &isCopy); |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
221 |
audioBufferFrames = mEnv->GetArrayLength((jshortArray)audioBuffer); |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
222 |
} else { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
223 |
audioBufferPinned = mEnv->GetByteArrayElements((jbyteArray)audioBuffer, &isCopy); |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
224 |
audioBufferFrames = mEnv->GetArrayLength((jbyteArray)audioBuffer); |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
225 |
} |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
226 |
if (audioBufferStereo) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
227 |
audioBufferFrames /= 2; |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
228 |
} |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
229 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
230 |
return audioBufferFrames; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
231 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
232 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
233 |
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
|
234 |
{ |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
235 |
return audioBufferPinned; |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
236 |
} |
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
|
237 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
238 |
extern "C" void Android_JNI_WriteAudioBuffer() |
4995
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
239 |
{ |
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
240 |
if (audioBuffer16Bit) { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
241 |
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
|
242 |
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
|
243 |
} else { |
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
244 |
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
|
245 |
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
|
246 |
} |
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
|
247 |
|
4996
8d7315668e35
Fixed audio buffer lifecycle and implemented audio shutdown
Sam Lantinga <slouken@libsdl.org>
parents:
4995
diff
changeset
|
248 |
/* 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
|
249 |
} |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
250 |
|
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
251 |
extern "C" void Android_JNI_CloseAudioDevice() |
9f9bea41e88f
Working audio implementation contributed by Joseph Lunderville
Sam Lantinga <slouken@libsdl.org>
parents:
4989
diff
changeset
|
252 |
{ |
4998
a514bfe6952a
The window is changed to reflect the actual screen dimensions, for now.
Sam Lantinga <slouken@libsdl.org>
parents:
4997
diff
changeset
|
253 |
mEnv->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
|
254 |
|
4997
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
255 |
if (audioBuffer) { |
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
256 |
mEnv->DeleteGlobalRef(audioBuffer); |
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
257 |
audioBuffer = NULL; |
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
258 |
audioBufferPinned = NULL; |
a21501393bef
Removed code from GetPrimtiveArrayCritical() experiment
Sam Lantinga <slouken@libsdl.org>
parents:
4996
diff
changeset
|
259 |
} |
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
|
260 |
} |
4981
55b82067815b
Fill in the video mode with the correct screen format
Sam Lantinga <slouken@libsdl.org>
parents:
4980
diff
changeset
|
261 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
262 |
// 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
|
263 |
static bool Android_JNI_ExceptionOccurred() |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
264 |
{ |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
265 |
jthrowable exception = mEnv->ExceptionOccurred(); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
266 |
if (exception != NULL) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
267 |
jmethodID mid; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
268 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
269 |
// 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
|
270 |
mEnv->ExceptionClear(); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
271 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
272 |
jclass exceptionClass = mEnv->GetObjectClass(exception); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
273 |
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
|
274 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
275 |
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
|
276 |
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
|
277 |
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
|
278 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
279 |
mid = mEnv->GetMethodID(exceptionClass, "getMessage", "()Ljava/lang/String;"); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
280 |
jstring exceptionMessage = (jstring)mEnv->CallObjectMethod(exceptionClass, mid); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
281 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
282 |
if (exceptionMessage != NULL) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
283 |
const char* exceptionMessageUTF8 = mEnv->GetStringUTFChars( |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
284 |
exceptionMessage, 0); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
285 |
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
|
286 |
mEnv->ReleaseStringUTFChars(exceptionMessage, exceptionMessageUTF8); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
287 |
mEnv->DeleteLocalRef(exceptionMessage); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
288 |
} else { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
289 |
SDL_SetError("%s", exceptionNameUTF8); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
290 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
291 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
292 |
mEnv->ReleaseStringUTFChars(exceptionName, exceptionNameUTF8); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
293 |
mEnv->DeleteLocalRef(exceptionName); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
294 |
mEnv->DeleteLocalRef(classClass); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
295 |
mEnv->DeleteLocalRef(exceptionClass); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
296 |
mEnv->DeleteLocalRef(exception); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
297 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
298 |
return true; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
299 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
300 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
301 |
return false; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
302 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
303 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
304 |
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
|
305 |
{ |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
306 |
int result = 0; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
307 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
308 |
jmethodID mid; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
309 |
jobject context; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
310 |
jobject assetManager; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
311 |
jobject inputStream; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
312 |
jclass channels; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
313 |
jobject readableByteChannel; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
314 |
jstring fileNameJString; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
315 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
316 |
bool allocatedLocalFrame = false; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
317 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
318 |
if (mEnv->PushLocalFrame(16) < 0) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
319 |
SDL_SetError("Failed to allocate enough JVM local references"); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
320 |
goto failure; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
321 |
} else { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
322 |
allocatedLocalFrame = true; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
323 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
324 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
325 |
fileNameJString = (jstring)ctx->hidden.androidio.fileName; |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
326 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
327 |
// context = SDLActivity.getContext(); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
328 |
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
|
329 |
"getContext","()Landroid/content/Context;"); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
330 |
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
|
331 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
332 |
// 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
|
333 |
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
|
334 |
"getAssets", "()Landroid/content/res/AssetManager;"); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
335 |
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
|
336 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
337 |
// 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
|
338 |
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
|
339 |
"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
|
340 |
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
|
341 |
if (Android_JNI_ExceptionOccurred()) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
342 |
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
|
343 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
344 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
345 |
ctx->hidden.androidio.inputStream = inputStream; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
346 |
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
|
347 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
348 |
// Store .skip id for seeking purposes |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
349 |
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
|
350 |
"skip", "(J)J"); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
351 |
ctx->hidden.androidio.skipMethod = mid; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
352 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
353 |
// 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
|
354 |
// 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
|
355 |
// 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
|
356 |
// 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
|
357 |
// 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
|
358 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
359 |
// 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
|
360 |
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
|
361 |
"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
|
362 |
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
|
363 |
if (Android_JNI_ExceptionOccurred()) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
364 |
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
|
365 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
366 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
367 |
// readableByteChannel = Channels.newChannel(inputStream); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
368 |
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
|
369 |
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
|
370 |
"newChannel", |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
371 |
"(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
|
372 |
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
|
373 |
channels, mid, inputStream); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
374 |
if (Android_JNI_ExceptionOccurred()) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
375 |
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
|
376 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
377 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
378 |
ctx->hidden.androidio.readableByteChannel = readableByteChannel; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
379 |
ctx->hidden.androidio.readableByteChannelRef = |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
380 |
mEnv->NewGlobalRef(readableByteChannel); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
381 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
382 |
// 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
|
383 |
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
|
384 |
"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
|
385 |
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
|
386 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
387 |
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
|
388 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
389 |
if (false) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
390 |
failure: |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
391 |
result = -1; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
392 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
393 |
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
|
394 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
395 |
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
|
396 |
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
|
397 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
398 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
399 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
400 |
if (allocatedLocalFrame) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
401 |
mEnv->PopLocalFrame(NULL); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
402 |
} |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
403 |
|
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
404 |
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
|
405 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
406 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
407 |
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
|
408 |
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
|
409 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
410 |
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
|
411 |
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
|
412 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
413 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
414 |
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
|
415 |
ctx->hidden.androidio.fileName = fileNameJString; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
416 |
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
|
417 |
ctx->hidden.androidio.inputStreamRef = NULL; |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
418 |
mEnv->DeleteLocalRef(fileNameJString); |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
419 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
420 |
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
|
421 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
422 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
423 |
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
|
424 |
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
|
425 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
426 |
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
|
427 |
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
|
428 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
429 |
jobject readableByteChannel = (jobject)ctx->hidden.androidio.readableByteChannel; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
430 |
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
|
431 |
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
|
432 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
433 |
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
|
434 |
// 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
|
435 |
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
|
436 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
437 |
if (Android_JNI_ExceptionOccurred()) { |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
438 |
mEnv->DeleteLocalRef(byteBuffer); |
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
439 |
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
|
440 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
441 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
442 |
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
|
443 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
444 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
445 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
446 |
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
|
447 |
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
|
448 |
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
|
449 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
450 |
|
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
451 |
mEnv->DeleteLocalRef(byteBuffer); |
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
452 |
|
5582
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
453 |
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
|
454 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
455 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
456 |
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
|
457 |
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
|
458 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
459 |
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
|
460 |
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
|
461 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
462 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
463 |
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
|
464 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
465 |
int 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
|
466 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
467 |
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
|
468 |
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
|
469 |
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
|
470 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
471 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
472 |
jobject inputStream = (jobject)ctx->hidden.androidio.inputStream; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
473 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
474 |
// 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
|
475 |
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
|
476 |
"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
|
477 |
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
|
478 |
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
|
479 |
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
|
480 |
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
|
481 |
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
|
482 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
483 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
484 |
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
|
485 |
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
|
486 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
487 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
488 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
489 |
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
|
490 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
491 |
|
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 |
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
|
494 |
{ |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
495 |
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
|
496 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
497 |
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
|
498 |
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
|
499 |
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
|
500 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
501 |
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
|
502 |
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
|
503 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
504 |
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
|
505 |
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
|
506 |
break; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
507 |
default: |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
508 |
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
|
509 |
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
|
510 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
511 |
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
|
512 |
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
|
513 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
514 |
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
|
515 |
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
|
516 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
517 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
518 |
long movement = newPosition - 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
|
519 |
jobject inputStream = (jobject)ctx->hidden.androidio.inputStream; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
520 |
jmethodID skipMethod = (jmethodID)ctx->hidden.androidio.skipMethod; |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
521 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
522 |
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
|
523 |
// 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
|
524 |
while (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
|
525 |
// inputStream.skip(...); |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
526 |
movement -= mEnv->CallLongMethod(inputStream, skipMethod, movement); |
5650
640c67302f8e
* Fix many memory leaks in Android FS code
Tim Angus <tim@blackcompanystudios.co.uk>
parents:
5582
diff
changeset
|
527 |
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
|
528 |
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
|
529 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
530 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
531 |
} 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
|
532 |
// 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
|
533 |
// 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
|
534 |
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
|
535 |
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
|
536 |
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
|
537 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
538 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
539 |
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
|
540 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
541 |
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
|
542 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
543 |
|
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
544 |
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
|
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 |
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
|
547 |
} |
1281a3f1f0a6
Allow Android platforms to read from .apk files via the RWOPS interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
5535
diff
changeset
|
548 |
|
4981
55b82067815b
Fill in the video mode with the correct screen format
Sam Lantinga <slouken@libsdl.org>
parents:
4980
diff
changeset
|
549 |
/* vi: set ts=4 sw=4 expandtab: */ |