ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-24 17:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove trailing spaces in Android source code.

Browse source
This commit is contained in:
Reto Schneider 2015-04-08 12:14:36 +02:00
parent eff61ee39d
commit e5f9c347ef
1 changed files with 61 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
android-project/src/org/libsdl/app/SDLActivity.java
View file

@ -54,7 +54,7 @@ public class SDLActivity extends Activity {
// This is what SDL runs in. It invokes SDL_main(), eventually // This is what SDL runs in. It invokes SDL_main(), eventually
protected static Thread mSDLThread; protected static Thread mSDLThread;
// Audio // Audio
protected static AudioTrack mAudioTrack; protected static AudioTrack mAudioTrack;
@ -83,7 +83,7 @@ public class SDLActivity extends Activity {
System.loadLibrary(lib); System.loadLibrary(lib);
} }
} }
/** /**
* This method is called by SDL before starting the native application thread. * This method is called by SDL before starting the native application thread.
* It can be overridden to provide the arguments after the application name. * It can be overridden to provide the arguments after the application name.
@ -93,7 +93,7 @@ public class SDLActivity extends Activity {
protected String[] getArguments() { protected String[] getArguments() {
return new String[0]; return new String[0];
} }
public static void initialize() { public static void initialize() {
// The static nature of the singleton and Android quirkyness force us to initialize everything here // The static nature of the singleton and Android quirkyness force us to initialize everything here
// Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values // Otherwise, when exiting the app and returning to it, these variables *keep* their pre exit values
@ -114,11 +114,11 @@ public class SDLActivity extends Activity {
// Setup // Setup
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
Log.v("SDL", "Device: " + android.os.Build.DEVICE); Log.v("SDL", "Device: " + android.os.Build.DEVICE);
Log.v("SDL", "Model: " + android.os.Build.MODEL); Log.v("SDL", "Model: " + android.os.Build.MODEL);
Log.v("SDL", "onCreate():" + mSingleton); Log.v("SDL", "onCreate():" + mSingleton);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
SDLActivity.initialize(); SDLActivity.initialize();
// So we can call stuff from static callbacks // So we can call stuff from static callbacks
mSingleton = this; mSingleton = this;
@ -161,7 +161,7 @@ public class SDLActivity extends Activity {
// Set up the surface // Set up the surface
mSurface = new SDLSurface(getApplication()); mSurface = new SDLSurface(getApplication());
if(Build.VERSION.SDK_INT >= 12) { if(Build.VERSION.SDK_INT >= 12) {
mJoystickHandler = new SDLJoystickHandler_API12(); mJoystickHandler = new SDLJoystickHandler_API12();
} }
@ -254,7 +254,7 @@ public class SDLActivity extends Activity {
//Log.v("SDL", "Finished waiting for SDL thread"); //Log.v("SDL", "Finished waiting for SDL thread");
} }
super.onDestroy(); super.onDestroy();
// Reset everything in case the user re opens the app // Reset everything in case the user re opens the app
SDLActivity.initialize(); SDLActivity.initialize();
@ -303,7 +303,7 @@ public class SDLActivity extends Activity {
mSurface.handleResume(); mSurface.handleResume();
} }
} }
/* The native thread has finished */ /* The native thread has finished */
public static void handleNativeExit() { public static void handleNativeExit() {
SDLActivity.mSDLThread = null; SDLActivity.mSDLThread = null;
@ -409,14 +409,14 @@ public class SDLActivity extends Activity {
public static native void onNativeKeyboardFocusLost(); public static native void onNativeKeyboardFocusLost();
public static native void onNativeMouse(int button, int action, float x, float y); public static native void onNativeMouse(int button, int action, float x, float y);
public static native void onNativeTouch(int touchDevId, int pointerFingerId, public static native void onNativeTouch(int touchDevId, int pointerFingerId,
int action, float x, int action, float x,
float y, float p); float y, float p);
public static native void onNativeAccel(float x, float y, float z); public static native void onNativeAccel(float x, float y, float z);
public static native void onNativeSurfaceChanged(); public static native void onNativeSurfaceChanged();
public static native void onNativeSurfaceDestroyed(); public static native void onNativeSurfaceDestroyed();
public static native void nativeFlipBuffers(); public static native void nativeFlipBuffers();
public static native int nativeAddJoystick(int device_id, String name, public static native int nativeAddJoystick(int device_id, String name,
int is_accelerometer, int nbuttons, int is_accelerometer, int nbuttons,
int naxes, int nhats, int nballs); int naxes, int nhats, int nballs);
public static native int nativeRemoveJoystick(int device_id); public static native int nativeRemoveJoystick(int device_id);
public static native String nativeGetHint(String name); public static native String nativeGetHint(String name);
@ -541,33 +541,33 @@ public class SDLActivity extends Activity {
int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO; int channelConfig = isStereo ? AudioFormat.CHANNEL_CONFIGURATION_STEREO : AudioFormat.CHANNEL_CONFIGURATION_MONO;
int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT; int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1); int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer"); Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
// Let the user pick a larger buffer if they really want -- but ye // Let the user pick a larger buffer if they really want -- but ye
// gods they probably shouldn't, the minimums are horrifyingly high // gods they probably shouldn't, the minimums are horrifyingly high
// latency already // latency already
desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize); desiredFrames = Math.max(desiredFrames, (AudioTrack.getMinBufferSize(sampleRate, channelConfig, audioFormat) + frameSize - 1) / frameSize);
if (mAudioTrack == null) { if (mAudioTrack == null) {
mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate, mAudioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, sampleRate,
channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM); channelConfig, audioFormat, desiredFrames * frameSize, AudioTrack.MODE_STREAM);
// Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid // Instantiating AudioTrack can "succeed" without an exception and the track may still be invalid
// Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java // Ref: https://android.googlesource.com/platform/frameworks/base/+/refs/heads/master/media/java/android/media/AudioTrack.java
// Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState() // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) { if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
Log.e("SDL", "Failed during initialization of Audio Track"); Log.e("SDL", "Failed during initialization of Audio Track");
mAudioTrack = null; mAudioTrack = null;
return -1; return -1;
} }
mAudioTrack.play(); mAudioTrack.play();
} }
Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer"); Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
return 0; return 0;
} }
@ -927,11 +927,11 @@ class SDLMain implements Runnable {
/** /**
SDLSurface. This is what we draw on, so we need to know when it's created SDLSurface. This is what we draw on, so we need to know when it's created
in order to do anything useful. in order to do anything useful.
Because of this, that's where we set up the SDL thread Because of this, that's where we set up the SDL thread
*/ */
class SDLSurface extends SurfaceView implements SurfaceHolder.Callback, class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
View.OnKeyListener, View.OnTouchListener, SensorEventListener { View.OnKeyListener, View.OnTouchListener, SensorEventListener {
// Sensors // Sensors
@ -941,20 +941,20 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
// Keep track of the surface size to normalize touch events // Keep track of the surface size to normalize touch events
protected static float mWidth, mHeight; protected static float mWidth, mHeight;
// Startup // Startup
public SDLSurface(Context context) { public SDLSurface(Context context) {
super(context); super(context);
getHolder().addCallback(this); getHolder().addCallback(this);
setFocusable(true); setFocusable(true);
setFocusableInTouchMode(true); setFocusableInTouchMode(true);
requestFocus(); requestFocus();
setOnKeyListener(this); setOnKeyListener(this);
setOnTouchListener(this); setOnTouchListener(this);
mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); mDisplay = ((WindowManager)context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE); mSensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
if(Build.VERSION.SDK_INT >= 12) { if(Build.VERSION.SDK_INT >= 12) {
setOnGenericMotionListener(new SDLGenericMotionListener_API12()); setOnGenericMotionListener(new SDLGenericMotionListener_API12());
} }
@ -963,7 +963,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
mWidth = 1.0f; mWidth = 1.0f;
mHeight = 1.0f; mHeight = 1.0f;
} }
public void handleResume() { public void handleResume() {
setFocusable(true); setFocusable(true);
setFocusableInTouchMode(true); setFocusableInTouchMode(true);
@ -972,7 +972,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
setOnTouchListener(this); setOnTouchListener(this);
enableSensor(Sensor.TYPE_ACCELEROMETER, true); enableSensor(Sensor.TYPE_ACCELEROMETER, true);
} }
public Surface getNativeSurface() { public Surface getNativeSurface() {
return getHolder().getSurface(); return getHolder().getSurface();
} }
@ -1062,7 +1062,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
final Thread sdlThread = new Thread(new SDLMain(), "SDLThread"); final Thread sdlThread = new Thread(new SDLMain(), "SDLThread");
enableSensor(Sensor.TYPE_ACCELEROMETER, true); enableSensor(Sensor.TYPE_ACCELEROMETER, true);
sdlThread.start(); sdlThread.start();
// Set up a listener thread to catch when the native thread ends // Set up a listener thread to catch when the native thread ends
SDLActivity.mSDLThread = new Thread(new Runnable(){ SDLActivity.mSDLThread = new Thread(new Runnable(){
@Override @Override
@ -1071,7 +1071,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
sdlThread.join(); sdlThread.join();
} }
catch(Exception e){} catch(Exception e){}
finally{ finally{
// Native thread has finished // Native thread has finished
if (! SDLActivity.mExitCalledFromJava) { if (! SDLActivity.mExitCalledFromJava) {
SDLActivity.handleNativeExit(); SDLActivity.handleNativeExit();
@ -1107,7 +1107,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
} }
} }
if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) { if( (event.getSource() & InputDevice.SOURCE_KEYBOARD) != 0) {
if (event.getAction() == KeyEvent.ACTION_DOWN) { if (event.getAction() == KeyEvent.ACTION_DOWN) {
//Log.v("SDL", "key down: " + keyCode); //Log.v("SDL", "key down: " + keyCode);
@ -1120,7 +1120,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
return true; return true;
} }
} }
return false; return false;
} }
@ -1159,7 +1159,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p); SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
} }
break; break;
case MotionEvent.ACTION_UP: case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
// Primary pointer up/down, the index is always zero // Primary pointer up/down, the index is always zero
@ -1170,14 +1170,14 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
if (i == -1) { if (i == -1) {
i = event.getActionIndex(); i = event.getActionIndex();
} }
pointerFingerId = event.getPointerId(i); pointerFingerId = event.getPointerId(i);
x = event.getX(i) / mWidth; x = event.getX(i) / mWidth;
y = event.getY(i) / mHeight; y = event.getY(i) / mHeight;
p = event.getPressure(i); p = event.getPressure(i);
SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p); SDLActivity.onNativeTouch(touchDevId, pointerFingerId, action, x, y, p);
break; break;
case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_CANCEL:
for (i = 0; i < pointerCount; i++) { for (i = 0; i < pointerCount; i++) {
pointerFingerId = event.getPointerId(i); pointerFingerId = event.getPointerId(i);
@ -1194,21 +1194,21 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
return true; return true;
} }
// Sensor events // Sensor events
public void enableSensor(int sensortype, boolean enabled) { public void enableSensor(int sensortype, boolean enabled) {
// TODO: This uses getDefaultSensor - what if we have >1 accels? // TODO: This uses getDefaultSensor - what if we have >1 accels?
if (enabled) { if (enabled) {
mSensorManager.registerListener(this, mSensorManager.registerListener(this,
mSensorManager.getDefaultSensor(sensortype), mSensorManager.getDefaultSensor(sensortype),
SensorManager.SENSOR_DELAY_GAME, null); SensorManager.SENSOR_DELAY_GAME, null);
} else { } else {
mSensorManager.unregisterListener(this, mSensorManager.unregisterListener(this,
mSensorManager.getDefaultSensor(sensortype)); mSensorManager.getDefaultSensor(sensortype));
} }
} }
@Override @Override
public void onAccuracyChanged(Sensor sensor, int accuracy) { public void onAccuracyChanged(Sensor sensor, int accuracy) {
// TODO // TODO
@ -1240,7 +1240,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
y / SensorManager.GRAVITY_EARTH, y / SensorManager.GRAVITY_EARTH,
event.values[2] / SensorManager.GRAVITY_EARTH - 1); event.values[2] / SensorManager.GRAVITY_EARTH - 1);
} }
} }
} }
/* This is a fake invisible editor view that receives the input and defines the /* This is a fake invisible editor view that receives the input and defines the
@ -1282,7 +1282,7 @@ class DummyEdit extends View implements View.OnKeyListener {
return false; return false;
} }
// //
@Override @Override
public boolean onKeyPreIme (int keyCode, KeyEvent event) { public boolean onKeyPreIme (int keyCode, KeyEvent event) {
@ -1361,7 +1361,7 @@ class SDLInputConnection extends BaseInputConnection {
public native void nativeSetComposingText(String text, int newCursorPosition); public native void nativeSetComposingText(String text, int newCursorPosition);
@Override @Override
public boolean deleteSurroundingText(int beforeLength, int afterLength) { public boolean deleteSurroundingText(int beforeLength, int afterLength) {
// Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection // Workaround to capture backspace key. Ref: http://stackoverflow.com/questions/14560344/android-backspace-in-webview-baseinputconnection
if (beforeLength == 1 && afterLength == 0) { if (beforeLength == 1 && afterLength == 0) {
// backspace // backspace
@ -1375,7 +1375,7 @@ class SDLInputConnection extends BaseInputConnection {
/* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */ /* A null joystick handler for API level < 12 devices (the accelerometer is handled separately) */
class SDLJoystickHandler { class SDLJoystickHandler {
/** /**
* Handles given MotionEvent. * Handles given MotionEvent.
* @param event the event to be handled. * @param event the event to be handled.
@ -1407,11 +1407,11 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
return arg0.getAxis() - arg1.getAxis(); return arg0.getAxis() - arg1.getAxis();
} }
} }
private ArrayList<SDLJoystick> mJoysticks; private ArrayList<SDLJoystick> mJoysticks;
public SDLJoystickHandler_API12() { public SDLJoystickHandler_API12() {
mJoysticks = new ArrayList<SDLJoystick>(); mJoysticks = new ArrayList<SDLJoystick>();
} }
@ -1422,7 +1422,7 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
// For example, in the case of the XBox 360 wireless dongle, // For example, in the case of the XBox 360 wireless dongle,
// so the first controller seen by SDL matches what the receiver // so the first controller seen by SDL matches what the receiver
// considers to be the first controller // considers to be the first controller
for(int i=deviceIds.length-1; i>-1; i--) { for(int i=deviceIds.length-1; i>-1; i--) {
SDLJoystick joystick = getJoystick(deviceIds[i]); SDLJoystick joystick = getJoystick(deviceIds[i]);
if (joystick == null) { if (joystick == null) {
@ -1433,7 +1433,7 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
joystick.name = joystickDevice.getName(); joystick.name = joystickDevice.getName();
joystick.axes = new ArrayList<InputDevice.MotionRange>(); joystick.axes = new ArrayList<InputDevice.MotionRange>();
joystick.hats = new ArrayList<InputDevice.MotionRange>(); joystick.hats = new ArrayList<InputDevice.MotionRange>();
List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges(); List<InputDevice.MotionRange> ranges = joystickDevice.getMotionRanges();
Collections.sort(ranges, new RangeComparator()); Collections.sort(ranges, new RangeComparator());
for (InputDevice.MotionRange range : ranges ) { for (InputDevice.MotionRange range : ranges ) {
@ -1447,14 +1447,14 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
} }
} }
} }
mJoysticks.add(joystick); mJoysticks.add(joystick);
SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1, SDLActivity.nativeAddJoystick(joystick.device_id, joystick.name, 0, -1,
joystick.axes.size(), joystick.hats.size()/2, 0); joystick.axes.size(), joystick.hats.size()/2, 0);
} }
} }
} }
/* Check removed devices */ /* Check removed devices */
ArrayList<Integer> removedDevices = new ArrayList<Integer>(); ArrayList<Integer> removedDevices = new ArrayList<Integer>();
for(int i=0; i < mJoysticks.size(); i++) { for(int i=0; i < mJoysticks.size(); i++) {
@ -1467,7 +1467,7 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
removedDevices.add(Integer.valueOf(device_id)); removedDevices.add(Integer.valueOf(device_id));
} }
} }
for(int i=0; i < removedDevices.size(); i++) { for(int i=0; i < removedDevices.size(); i++) {
int device_id = removedDevices.get(i).intValue(); int device_id = removedDevices.get(i).intValue();
SDLActivity.nativeRemoveJoystick(device_id); SDLActivity.nativeRemoveJoystick(device_id);
@ -1477,9 +1477,9 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
break; break;
} }
} }
} }
} }
protected SDLJoystick getJoystick(int device_id) { protected SDLJoystick getJoystick(int device_id) {
for(int i=0; i < mJoysticks.size(); i++) { for(int i=0; i < mJoysticks.size(); i++) {
if (mJoysticks.get(i).device_id == device_id) { if (mJoysticks.get(i).device_id == device_id) {
@ -1487,9 +1487,9 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
} }
} }
return null; return null;
} }
@Override @Override
public boolean handleMotionEvent(MotionEvent event) { public boolean handleMotionEvent(MotionEvent event) {
if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) { if ( (event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
int actionPointerIndex = event.getActionIndex(); int actionPointerIndex = event.getActionIndex();
@ -1503,7 +1503,7 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
/* Normalize the value to -1...1 */ /* Normalize the value to -1...1 */
float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f; float value = ( event.getAxisValue( range.getAxis(), actionPointerIndex) - range.getMin() ) / range.getRange() * 2.0f - 1.0f;
SDLActivity.onNativeJoy(joystick.device_id, i, value ); SDLActivity.onNativeJoy(joystick.device_id, i, value );
} }
for (int i = 0; i < joystick.hats.size(); i+=2) { for (int i = 0; i < joystick.hats.size(); i+=2) {
int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) ); int hatX = Math.round(event.getAxisValue( joystick.hats.get(i).getAxis(), actionPointerIndex ) );
int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) ); int hatY = Math.round(event.getAxisValue( joystick.hats.get(i+1).getAxis(), actionPointerIndex ) );
@ -1516,7 +1516,7 @@ class SDLJoystickHandler_API12 extends SDLJoystickHandler {
} }
} }
return true; return true;
} }
} }
class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener { class SDLGenericMotionListener_API12 implements View.OnGenericMotionListener {