From bad7671159818d4590a139cee8f9ee11a7ae7434 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 17 Nov 2013 21:34:07 +0100 Subject: [PATCH] (Android) Stub camera functions in Java --- .../com/retroarch/browser/RetroActivity.java | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/android/phoenix/src/com/retroarch/browser/RetroActivity.java b/android/phoenix/src/com/retroarch/browser/RetroActivity.java index d70950a7ec..8149786827 100644 --- a/android/phoenix/src/com/retroarch/browser/RetroActivity.java +++ b/android/phoenix/src/com/retroarch/browser/RetroActivity.java @@ -1,11 +1,47 @@ package com.retroarch.browser; +import java.io.IOException; import com.retroarch.browser.preferences.util.UserPreferences; - +import android.annotation.SuppressLint; import android.app.NativeActivity; +import android.graphics.SurfaceTexture; +import android.hardware.Camera; +import android.os.Build; public final class RetroActivity extends NativeActivity { + Camera mCamera; + + public void onCameraStart() + { + mCamera.startPreview(); + } + + public void onCameraStop() + { + mCamera.stopPreview(); + } + + public void onCameraInit() + { + mCamera = Camera.open(); + } + + public void onCameraFree() + { + mCamera.release(); + mCamera = null; + } + + @SuppressLint("NewApi") + public void onCameraSetTexture(int gl_texid) throws IOException + { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) + mCamera.setPreviewTexture(new SurfaceTexture(gl_texid)); + else + mCamera.setPreviewDisplay(null); + } + @Override public void onDestroy() {