We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Update accelerometer name.

accelerometer_name.patch (text/plain), 3.26 KB, created by Joseba García Echebarria on 2012-12-15 14:15:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseba García Echebarria

Created: 2012-12-15 14:15:13 UTC

Size: 3.26 KB

patch

obsolete

>diff -r 398073b195bb android-project/src/org/libsdl/app/SDLActivity.java
>--- a/android-project/src/org/libsdl/app/SDLActivity.java	Fri Dec 14 23:05:34 2012 -0800
>+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Sat Dec 15 23:05:47 2012 +0100
>@@ -161,7 +161,7 @@
>     public static native void onNativeTouch(int touchDevId, int pointerFingerId,
>                                             int action, float x, 
>                                             float y, float p);
>-    public static native void onNativeAccel(float x, float y, float z);
>+    public static native void onNativeAccel(String name, float x, float y, float z);
>     public static native void nativeRunAudioThread();
> 
> 
>@@ -657,7 +657,8 @@
> 
>     public void onSensorChanged(SensorEvent event) {
>         if (event.sensor.getType() == Sensor.TYPE_ACCELEROMETER) {
>-            SDLActivity.onNativeAccel(event.values[0] / SensorManager.GRAVITY_EARTH,
>+            SDLActivity.onNativeAccel(event.sensor.getName(),
>+                                      event.values[0] / SensorManager.GRAVITY_EARTH,
>                                       event.values[1] / SensorManager.GRAVITY_EARTH,
>                                       event.values[2] / SensorManager.GRAVITY_EARTH);
>         }
>diff -r 398073b195bb src/core/android/SDL_android.cpp
>--- a/src/core/android/SDL_android.cpp	Fri Dec 14 23:05:34 2012 -0800
>+++ b/src/core/android/SDL_android.cpp	Sat Dec 15 23:05:47 2012 +0100
>@@ -74,6 +74,7 @@
> static jmethodID midAudioQuit;
> 
> // Accelerometer data storage
>+static char *cLastAccelerometerName;
> static float fLastAccelerometer[3];
> static bool bHasNewData;
> 
>@@ -170,8 +171,11 @@
> // Accelerometer
> extern "C" void Java_org_libsdl_app_SDLActivity_onNativeAccel(
>                                     JNIEnv* env, jclass jcls,
>-                                    jfloat x, jfloat y, jfloat z)
>+                                    jstring name, jfloat x, jfloat y, jfloat z)
> {
>+    const char *utftext = env->GetStringUTFChars(name, NULL);
>+    cLastAccelerometerName = strndup(utftext, strlen(utftext));
>+    env->ReleaseStringUTFChars(name, utftext);
>     fLastAccelerometer[0] = x;
>     fLastAccelerometer[1] = y;
>     fLastAccelerometer[2] = z;
>@@ -336,6 +340,11 @@
>     return retval;
> }
> 
>+extern "C" char *Android_JNI_GetAccelerometerName()
>+{
>+    return cLastAccelerometerName;
>+}
>+
> static void Android_JNI_ThreadDestroyed(void* value) {
>     /* The thread is being destroyed, detach it from the Java VM and set the mThreadKey value to NULL as required */
>     JNIEnv *env = (JNIEnv*) value;
>diff -r 398073b195bb src/joystick/android/SDL_sysjoystick.c
>--- a/src/joystick/android/SDL_sysjoystick.c	Fri Dec 14 23:05:34 2012 -0800
>+++ b/src/joystick/android/SDL_sysjoystick.c	Sat Dec 15 23:05:47 2012 +0100
>@@ -33,7 +33,7 @@
> #include "../SDL_joystick_c.h"
> #include "../../core/android/SDL_android.h"
> 
>-static const char *accelerometerName = "Android accelerometer";
>+static char *accelerometerName;
> 
> /* Function to scan the system for joysticks.
>  * This function should set SDL_numjoysticks to the number of available
>@@ -116,6 +116,8 @@
>             value = (Sint16)(values[i] * 32767.0f);
>             SDL_PrivateJoystickAxis(joystick, i, value);
>         }
>+
>+        accelerometerName = Android_JNI_GetAccelerometerName();
>     }
> }
>

Actions: View | Diff

Attachments on bug 1664: 998

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.