encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed joystick crash on Android if joystick subsystem not initialized.

This commit is contained in:
Philipp Wiesemann 2013-11-10 17:50:40 +01:00
parent 305f64ba2e
commit 842a9898ce
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
android-project/src/org/libsdl/app/SDLActivity.java
View File

@ -433,6 +433,10 @@ public class SDLActivity extends Activity {
return mJoystickHandler.getJoystickAxes(joy); return mJoystickHandler.getJoystickAxes(joy);
} }
/**
* @param devId the device id to get opened joystick id for.
* @return joystick id for device id or -1 if there is none.
*/
public static int getJoyId(int devId) { public static int getJoyId(int devId) {
return mJoystickHandler.getJoyId(devId); return mJoystickHandler.getJoyId(devId);
} }
@ -606,11 +610,14 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} else if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */ } else if ( (event.getSource() & 0x00000401) != 0 || /* API 12: SOURCE_GAMEPAD */
(event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) { (event.getSource() & InputDevice.SOURCE_DPAD) != 0 ) {
int id = SDLActivity.getJoyId( event.getDeviceId() ); int id = SDLActivity.getJoyId( event.getDeviceId() );
if (event.getAction() == KeyEvent.ACTION_DOWN) { if (id != -1) {
SDLActivity.onNativePadDown(id, keyCode); if (event.getAction() == KeyEvent.ACTION_DOWN) {
} else if (event.getAction() == KeyEvent.ACTION_UP) { SDLActivity.onNativePadDown(id, keyCode);
SDLActivity.onNativePadUp(id, keyCode); } else if (event.getAction() == KeyEvent.ACTION_UP) {
SDLActivity.onNativePadUp(id, keyCode);
}
} }
return true;
} }
return false; return false;
@ -826,8 +833,12 @@ class SDLJoystickHandler {
return 0; return 0;
} }
/**
* @param devId the device id to get opened joystick id for.
* @return joystick id for device id or -1 if there is none.
*/
public int getJoyId(int devId) { public int getJoyId(int devId) {
return 0; return -1;
} }
} }
@ -887,10 +898,12 @@ class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {
switch(action) { switch(action) {
case MotionEvent.ACTION_MOVE: case MotionEvent.ACTION_MOVE:
int id = SDLActivity.getJoyId( event.getDeviceId() ); int id = SDLActivity.getJoyId( event.getDeviceId() );
float x = event.getAxisValue(MotionEvent.AXIS_X, actionPointerIndex); if (id != -1) {
float y = event.getAxisValue(MotionEvent.AXIS_Y, actionPointerIndex); float x = event.getAxisValue(MotionEvent.AXIS_X, actionPointerIndex);
SDLActivity.onNativeJoy(id, 0, x); float y = event.getAxisValue(MotionEvent.AXIS_Y, actionPointerIndex);
SDLActivity.onNativeJoy(id, 1, y); SDLActivity.onNativeJoy(id, 0, x);
SDLActivity.onNativeJoy(id, 1, y);
}
break; break;
} }
} }