From 96ca2135a4758a9115aacdd0743241a06fb62242 Mon Sep 17 00:00:00 2001 From: pelya Date: Tue, 8 Dec 2009 17:14:17 +0200 Subject: [PATCH] Oops, fixed linker error --- .../jni/sdl/src/audio/android/SDL_androidaudio.c | 6 +++--- alienblaster/project/src/DemoActivity.java | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/alienblaster/project/jni/sdl/src/audio/android/SDL_androidaudio.c b/alienblaster/project/jni/sdl/src/audio/android/SDL_androidaudio.c index 1644d1ff2..b6a6a948f 100644 --- a/alienblaster/project/jni/sdl/src/audio/android/SDL_androidaudio.c +++ b/alienblaster/project/jni/sdl/src/audio/android/SDL_androidaudio.c @@ -48,7 +48,7 @@ static void ANDROIDAUD_CloseAudio(_THIS); /* Audio driver bootstrap functions */ static int ANDROIDAUD_Available(void) { - return(1); + return(0); } static void ANDROIDAUD_DeleteDevice(SDL_AudioDevice *device) @@ -193,7 +193,7 @@ static void ANDROIDAUD_PlayAudio(_THIS) #define JAVA_EXPORT_NAME1(name,package) JAVA_EXPORT_NAME2(name,package) #define JAVA_EXPORT_NAME(name) JAVA_EXPORT_NAME1(name,SDL_JAVA_PACKAGE_PATH) -extern jintArray JAVA_EXPORT_NAME(nativeAudioInit) (JNIEnv * env, jobject jobj) +extern jintArray JAVA_EXPORT_NAME(AudioThread_nativeAudioInit) (JNIEnv * env, jobject jobj) { jintArray ret = NULL; int initData[4] = { 0, 0, 0, 0 }; // { rate, channels, encoding, bufsize }; @@ -220,7 +220,7 @@ extern jintArray JAVA_EXPORT_NAME(nativeAudioInit) (JNIEnv * env, jobject jobj) return (ret); }; -extern jint JAVA_EXPORT_NAME(nativeAudioBuffer) ( JNIEnv * env, jobject jobj, jbyteArray data ) +extern jint JAVA_EXPORT_NAME(AudioThread_nativeAudioBuffer) ( JNIEnv * env, jobject jobj, jbyteArray data ) { int ret = 0; diff --git a/alienblaster/project/src/DemoActivity.java b/alienblaster/project/src/DemoActivity.java index ba12d3af9..ed5112613 100644 --- a/alienblaster/project/src/DemoActivity.java +++ b/alienblaster/project/src/DemoActivity.java @@ -124,6 +124,18 @@ class DemoGLSurfaceView extends GLSurfaceView { mRenderer.exitApp(); }; + @Override + public boolean onKeyDown(int keyCode, final KeyEvent event) { + nativeKey( keyCode, 1 ); + return true; + } + + @Override + public boolean onKeyUp(int keyCode, final KeyEvent event) { + nativeKey( keyCode, 0 ); + return true; + } + DemoRenderer mRenderer; Activity mParent;