From 85a1a21c779340068172bd1fa38d03b226ef7640 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 19 Nov 2013 10:41:58 -0500 Subject: [PATCH] [Android] Clean up RetroActivity. --- .../com/retroarch/browser/RetroActivity.java | 43 ++++++++----------- 1 file changed, 17 insertions(+), 26 deletions(-) diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivity.java b/android/phoenix/src/com/retroarch/browser/RetroActivity.java index 6dc6afc8b7..798d26253c 100644 --- a/android/phoenix/src/com/retroarch/browser/RetroActivity.java +++ b/android/phoenix/src/com/retroarch/browser/RetroActivity.java @@ -16,31 +16,29 @@ public final class RetroActivity extends NativeActivity private Camera mCamera; private long lastTimestamp = 0; private SurfaceTexture texture; - - static { + + // Static constructor + static + { + Log.i("RetroActivity", "Creating RetroActivity"); System.loadLibrary("retroarch-activity"); } - - public RetroActivity() { - super(); - Log.i("RetroActivity", "Creating MyNativeActivity"); - } - + public void onCameraStart() { mCamera.startPreview(); } - + public void onCameraStop() { mCamera.stopPreview(); } - + public void onCameraInit() { mCamera = Camera.open(); } - + @SuppressLint("NewApi") public boolean onCameraPoll() { @@ -59,17 +57,18 @@ public final class RetroActivity extends NativeActivity } } else + { ret = true; - + } + return ret; } - + public void onCameraFree() { mCamera.release(); - mCamera = null; } - + @SuppressLint("NewApi") public void onCameraSetTexture(int gl_texid) throws IOException { @@ -79,22 +78,14 @@ public final class RetroActivity extends NativeActivity mCamera.setPreviewTexture(texture); } else + { mCamera.setPreviewDisplay(null); + } } - + @Override public void onDestroy() { UserPreferences.readbackConfigFile(this); } - - @Override - public void onLowMemory() - { - } - - @Override - public void onTrimMemory(int level) - { - } }