src/core/android/SDL_android.h
author Sam Lantinga <slouken@libsdl.org>
Fri, 13 Jan 2012 20:57:35 -0500
changeset 6212 78d854de3a66
parent 6138 4c64952a58fb
child 6354 17840f487124
permissions -rwxr-xr-x
Fixed bug 1368 - Enabling joystick subsystem cause an infinite loop

morgan.devel@gmail.com 2012-01-13 00:32:23 PST

The android version of SDL_SYS_JoystickUpdate doesn't check if there is
actually new data and always generate the SDL_JOYAXISMOTION event.
Consequently, doing a while(SDL_PollEvent()) will result in an endless loop.

The attached patch fix this issue.

It also scale the incoming values properly in the Sint16 range. The scale from
[-gravity;+gravity] is done directly in the java part because one may want to
map the sensor values with a non-linear method for example.
     1 /*
     2   Simple DirectMedia Layer
     3   Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     4 
     5   This software is provided 'as-is', without any express or implied
     6   warranty.  In no event will the authors be held liable for any damages
     7   arising from the use of this software.
     8 
     9   Permission is granted to anyone to use this software for any purpose,
    10   including commercial applications, and to alter it and redistribute it
    11   freely, subject to the following restrictions:
    12 
    13   1. The origin of this software must not be misrepresented; you must not
    14      claim that you wrote the original software. If you use this software
    15      in a product, an acknowledgment in the product documentation would be
    16      appreciated but is not required.
    17   2. Altered source versions must be plainly marked as such, and must not be
    18      misrepresented as being the original software.
    19   3. This notice may not be removed or altered from any source distribution.
    20 */
    21 #include "SDL_config.h"
    22 
    23 /* Set up for C function definitions, even when using C++ */
    24 #ifdef __cplusplus
    25 /* *INDENT-OFF* */
    26 extern "C" {
    27 /* *INDENT-ON* */
    28 #endif
    29 
    30 /* Interface from the SDL library into the Android Java activity */
    31 extern SDL_bool Android_JNI_CreateContext(int majorVersion, int minorVersion);
    32 extern void Android_JNI_SwapWindow();
    33 extern void Android_JNI_SetActivityTitle(const char *title);
    34 extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
    35 
    36 // Audio support
    37 extern int Android_JNI_OpenAudioDevice(int sampleRate, int is16Bit, int channelCount, int desiredBufferFrames);
    38 extern void* Android_JNI_GetAudioBuffer();
    39 extern void Android_JNI_WriteAudioBuffer();
    40 extern void Android_JNI_CloseAudioDevice();
    41 
    42 #include "SDL_rwops.h"
    43 
    44 int Android_JNI_FileOpen(SDL_RWops* ctx, const char* fileName, const char* mode);
    45 long Android_JNI_FileSeek(SDL_RWops* ctx, long offset, int whence);
    46 size_t Android_JNI_FileRead(SDL_RWops* ctx, void* buffer, size_t size, size_t maxnum);
    47 size_t Android_JNI_FileWrite(SDL_RWops* ctx, const void* buffer, size_t size, size_t num);
    48 int Android_JNI_FileClose(SDL_RWops* ctx);
    49 
    50 /* Ends C function definitions when using C++ */
    51 #ifdef __cplusplus
    52 /* *INDENT-OFF* */
    53 }
    54 /* *INDENT-ON* */
    55 #endif
    56 
    57 /* vi: set ts=4 sw=4 expandtab: */