From 87e409b3cce862c6088624290825ba6bd77bf1b8 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Tue, 11 Feb 2014 23:24:33 -0500 Subject: [PATCH 1/5] Massive cleanup and organization of processes by function --- shell/android/AndroidManifest.xml | 4 ++-- .../com/reicast/emulator/AboutFragment.java | 2 ++ .../src/com/reicast/emulator/FileBrowser.java | 2 ++ .../src/com/reicast/emulator/MainActivity.java | 6 ++++++ .../{ => config}/ConfigureFragment.java | 7 ++++++- .../{ => config}/EditVJoyActivity.java | 9 ++++++++- .../emulator/{ => config}/InputFragment.java | 5 ++++- .../{ => config}/InputModFragment.java | 5 ++++- .../emulator/{ => config}/OptionsFragment.java | 5 ++++- .../emulator/{ => debug}/GenerateLogs.java | 2 +- .../emulator/{ => debug}/GitAdapter.java | 3 ++- .../emulator/{ => debug}/UploadLogs.java | 4 +++- .../emulator/{ => emu}/GL2JNIActivity.java | 9 +++++++-- .../reicast/emulator/{ => emu}/GL2JNIView.java | 14 ++++++++++---- .../emulator/{ => emu}/GLCFactory6.java | 2 +- .../com/reicast/emulator/{ => emu}/JNIdc.java | 2 +- .../emulator/{ => emu}/SipEmulator.java | 2 +- .../emulator/{ => input}/MOGAInput.java | 18 +++++++++++------- .../emulator/{ => input}/OnScreenMenu.java | 10 ++++++++-- .../com/reicast/emulator/{ => input}/VJoy.java | 2 +- 20 files changed, 84 insertions(+), 29 deletions(-) rename shell/android/src/com/reicast/emulator/{ => config}/ConfigureFragment.java (98%) rename shell/android/src/com/reicast/emulator/{ => config}/EditVJoyActivity.java (92%) rename shell/android/src/com/reicast/emulator/{ => config}/InputFragment.java (99%) rename shell/android/src/com/reicast/emulator/{ => config}/InputModFragment.java (99%) rename shell/android/src/com/reicast/emulator/{ => config}/OptionsFragment.java (97%) rename shell/android/src/com/reicast/emulator/{ => debug}/GenerateLogs.java (99%) rename shell/android/src/com/reicast/emulator/{ => debug}/GitAdapter.java (99%) rename shell/android/src/com/reicast/emulator/{ => debug}/UploadLogs.java (98%) rename shell/android/src/com/reicast/emulator/{ => emu}/GL2JNIActivity.java (98%) rename shell/android/src/com/reicast/emulator/{ => emu}/GL2JNIView.java (98%) rename shell/android/src/com/reicast/emulator/{ => emu}/GLCFactory6.java (99%) rename shell/android/src/com/reicast/emulator/{ => emu}/JNIdc.java (98%) rename shell/android/src/com/reicast/emulator/{ => emu}/SipEmulator.java (98%) rename shell/android/src/com/reicast/emulator/{ => input}/MOGAInput.java (96%) rename shell/android/src/com/reicast/emulator/{ => input}/OnScreenMenu.java (95%) rename shell/android/src/com/reicast/emulator/{ => input}/VJoy.java (99%) diff --git a/shell/android/AndroidManifest.xml b/shell/android/AndroidManifest.xml index 338cdce94..52e09e2ed 100644 --- a/shell/android/AndroidManifest.xml +++ b/shell/android/AndroidManifest.xml @@ -44,7 +44,7 @@ @@ -91,7 +91,7 @@ diff --git a/shell/android/src/com/reicast/emulator/AboutFragment.java b/shell/android/src/com/reicast/emulator/AboutFragment.java index b0f3a2d20..3976291c2 100644 --- a/shell/android/src/com/reicast/emulator/AboutFragment.java +++ b/shell/android/src/com/reicast/emulator/AboutFragment.java @@ -92,6 +92,8 @@ import android.widget.SlidingDrawer.OnDrawerOpenListener; import android.widget.TextView; import android.widget.Toast; +import com.reicast.emulator.debug.GitAdapter; + public class AboutFragment extends Fragment { SlidingDrawer slidingGithub; diff --git a/shell/android/src/com/reicast/emulator/FileBrowser.java b/shell/android/src/com/reicast/emulator/FileBrowser.java index edc7bb82b..fcdea4412 100644 --- a/shell/android/src/com/reicast/emulator/FileBrowser.java +++ b/shell/android/src/com/reicast/emulator/FileBrowser.java @@ -40,6 +40,8 @@ import android.widget.TextView; import android.widget.Toast; import com.android.util.FileUtils; +import com.reicast.emulator.config.OptionsFragment; +import com.reicast.emulator.emu.JNIdc; public class FileBrowser extends Fragment { diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java index f267d1c1b..ccce25311 100644 --- a/shell/android/src/com/reicast/emulator/MainActivity.java +++ b/shell/android/src/com/reicast/emulator/MainActivity.java @@ -29,6 +29,12 @@ import com.android.util.DreamTime; import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnOpenListener; import com.jeremyfeinstein.slidingmenu.lib.app.SlidingFragmentActivity; +import com.reicast.emulator.config.ConfigureFragment; +import com.reicast.emulator.config.InputFragment; +import com.reicast.emulator.config.OptionsFragment; +import com.reicast.emulator.debug.GenerateLogs; +import com.reicast.emulator.emu.GL2JNIActivity; +import com.reicast.emulator.emu.JNIdc; public class MainActivity extends SlidingFragmentActivity implements FileBrowser.OnItemSelectedListener, OptionsFragment.OnClickListener { diff --git a/shell/android/src/com/reicast/emulator/ConfigureFragment.java b/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java similarity index 98% rename from shell/android/src/com/reicast/emulator/ConfigureFragment.java rename to shell/android/src/com/reicast/emulator/config/ConfigureFragment.java index fc8a14155..38a84bbb0 100644 --- a/shell/android/src/com/reicast/emulator/ConfigureFragment.java +++ b/shell/android/src/com/reicast/emulator/config/ConfigureFragment.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.config; import java.io.File; import java.io.FileOutputStream; @@ -34,6 +34,11 @@ import android.widget.TextView; import android.widget.Toast; import com.android.util.DreamTime; +import com.reicast.emulator.MainActivity; +import com.reicast.emulator.R; +import com.reicast.emulator.debug.GenerateLogs; +import com.reicast.emulator.emu.GL2JNIView; +import com.reicast.emulator.emu.JNIdc; import de.ankri.views.Switch; diff --git a/shell/android/src/com/reicast/emulator/EditVJoyActivity.java b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java similarity index 92% rename from shell/android/src/com/reicast/emulator/EditVJoyActivity.java rename to shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java index 974708b98..e53997057 100644 --- a/shell/android/src/com/reicast/emulator/EditVJoyActivity.java +++ b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.config; import android.annotation.TargetApi; import android.app.Activity; @@ -18,6 +18,13 @@ import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.Toast; +import com.reicast.emulator.MainActivity; +import com.reicast.emulator.R; +import com.reicast.emulator.emu.GL2JNIView; +import com.reicast.emulator.emu.JNIdc; +import com.reicast.emulator.input.OnScreenMenu; +import com.reicast.emulator.input.VJoy; + @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) public class EditVJoyActivity extends Activity { GL2JNIView mView; diff --git a/shell/android/src/com/reicast/emulator/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java similarity index 99% rename from shell/android/src/com/reicast/emulator/InputFragment.java rename to shell/android/src/com/reicast/emulator/config/InputFragment.java index 59bf7e2a4..e5b33370a 100644 --- a/shell/android/src/com/reicast/emulator/InputFragment.java +++ b/shell/android/src/com/reicast/emulator/config/InputFragment.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.config; import android.app.Activity; import android.app.AlertDialog; @@ -29,6 +29,9 @@ import com.bda.controller.Controller; import com.bda.controller.ControllerListener; import com.bda.controller.MotionEvent; import com.bda.controller.StateEvent; +import com.reicast.emulator.MainActivity; +import com.reicast.emulator.R; +import com.reicast.emulator.input.MOGAInput; import de.ankri.views.Switch; diff --git a/shell/android/src/com/reicast/emulator/InputModFragment.java b/shell/android/src/com/reicast/emulator/config/InputModFragment.java similarity index 99% rename from shell/android/src/com/reicast/emulator/InputModFragment.java rename to shell/android/src/com/reicast/emulator/config/InputModFragment.java index 9356f1988..ece965b2a 100644 --- a/shell/android/src/com/reicast/emulator/InputModFragment.java +++ b/shell/android/src/com/reicast/emulator/config/InputModFragment.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.config; import java.io.IOException; import java.io.InputStream; @@ -29,6 +29,9 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.ImageView; import android.widget.Spinner; import android.widget.TextView; + +import com.reicast.emulator.R; + import de.ankri.views.Switch; public class InputModFragment extends Fragment { diff --git a/shell/android/src/com/reicast/emulator/OptionsFragment.java b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java similarity index 97% rename from shell/android/src/com/reicast/emulator/OptionsFragment.java rename to shell/android/src/com/reicast/emulator/config/OptionsFragment.java index 2e978ead8..aead55b13 100644 --- a/shell/android/src/com/reicast/emulator/OptionsFragment.java +++ b/shell/android/src/com/reicast/emulator/config/OptionsFragment.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.config; import java.io.File; @@ -16,6 +16,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; +import com.reicast.emulator.MainActivity; +import com.reicast.emulator.R; + public class OptionsFragment extends Fragment { Activity parentActivity; diff --git a/shell/android/src/com/reicast/emulator/GenerateLogs.java b/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java similarity index 99% rename from shell/android/src/com/reicast/emulator/GenerateLogs.java rename to shell/android/src/com/reicast/emulator/debug/GenerateLogs.java index 1532713be..6733360fc 100644 --- a/shell/android/src/com/reicast/emulator/GenerateLogs.java +++ b/shell/android/src/com/reicast/emulator/debug/GenerateLogs.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.debug; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/shell/android/src/com/reicast/emulator/GitAdapter.java b/shell/android/src/com/reicast/emulator/debug/GitAdapter.java similarity index 99% rename from shell/android/src/com/reicast/emulator/GitAdapter.java rename to shell/android/src/com/reicast/emulator/debug/GitAdapter.java index 5c76d2a09..3dd7d5b85 100644 --- a/shell/android/src/com/reicast/emulator/GitAdapter.java +++ b/shell/android/src/com/reicast/emulator/debug/GitAdapter.java @@ -53,7 +53,7 @@ * subject to to the terms and conditions of the Apache License, Version 2.0. */ -package com.reicast.emulator; +package com.reicast.emulator.debug; import java.util.ArrayList; import java.util.HashMap; @@ -84,6 +84,7 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; import com.nostra13.universalimageloader.core.assist.ImageScaleType; +import com.reicast.emulator.R; public class GitAdapter extends BaseAdapter { diff --git a/shell/android/src/com/reicast/emulator/UploadLogs.java b/shell/android/src/com/reicast/emulator/debug/UploadLogs.java similarity index 98% rename from shell/android/src/com/reicast/emulator/UploadLogs.java rename to shell/android/src/com/reicast/emulator/debug/UploadLogs.java index 8caa31b6a..daa00137f 100644 --- a/shell/android/src/com/reicast/emulator/UploadLogs.java +++ b/shell/android/src/com/reicast/emulator/debug/UploadLogs.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.debug; import java.io.IOException; import java.net.MalformedURLException; @@ -22,6 +22,8 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; +import com.reicast.emulator.R; + public class UploadLogs extends AsyncTask { diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java similarity index 98% rename from shell/android/src/com/reicast/emulator/GL2JNIActivity.java rename to shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java index 06fd64374..be1aa0c85 100644 --- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.emu; import java.util.Arrays; import java.util.HashMap; @@ -23,9 +23,14 @@ import android.view.Window; import android.widget.PopupWindow; import android.widget.Toast; +import com.reicast.emulator.R; +import com.reicast.emulator.config.ConfigureFragment; +import com.reicast.emulator.input.MOGAInput; +import com.reicast.emulator.input.OnScreenMenu; + @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) public class GL2JNIActivity extends Activity { - GL2JNIView mView; + public GL2JNIView mView; OnScreenMenu menu; PopupWindow popUp; MOGAInput moga = new MOGAInput(); diff --git a/shell/android/src/com/reicast/emulator/GL2JNIView.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java similarity index 98% rename from shell/android/src/com/reicast/emulator/GL2JNIView.java rename to shell/android/src/com/reicast/emulator/emu/GL2JNIView.java index 3a8f9adcc..4b982ba4d 100644 --- a/shell/android/src/com/reicast/emulator/GL2JNIView.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.emu; import java.lang.reflect.InvocationTargetException; @@ -28,6 +28,9 @@ import android.view.ScaleGestureDetector; import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener; import android.view.View; +import com.reicast.emulator.MainActivity; +import com.reicast.emulator.input.VJoy; + /** * A simple GLSurfaceView sub-class that demonstrate how to perform @@ -48,7 +51,7 @@ import android.view.View; * bit depths). Failure to do so would result in an EGL_BAD_MATCH error. */ -class GL2JNIView extends GLSurfaceView +public class GL2JNIView extends GLSurfaceView { private static String fileName; //private AudioThread audioThread; @@ -304,8 +307,11 @@ class GL2JNIView extends GLSurfaceView return -1; // Invalid } - static int[] kcode_raw = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF }; - static int[] lt = new int[4], rt = new int[4], jx = new int[4], jy = new int[4]; + public static int[] kcode_raw = { 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF }; + public static int[] lt = new int[4]; + public static int[] rt = new int[4]; + public static int[] jx = new int[4]; + public static int[] jy = new int[4]; float editLastX = 0, editLastY = 0; diff --git a/shell/android/src/com/reicast/emulator/GLCFactory6.java b/shell/android/src/com/reicast/emulator/emu/GLCFactory6.java similarity index 99% rename from shell/android/src/com/reicast/emulator/GLCFactory6.java rename to shell/android/src/com/reicast/emulator/emu/GLCFactory6.java index 783761986..e1fdc9aff 100644 --- a/shell/android/src/com/reicast/emulator/GLCFactory6.java +++ b/shell/android/src/com/reicast/emulator/emu/GLCFactory6.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.emu; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; diff --git a/shell/android/src/com/reicast/emulator/JNIdc.java b/shell/android/src/com/reicast/emulator/emu/JNIdc.java similarity index 98% rename from shell/android/src/com/reicast/emulator/JNIdc.java rename to shell/android/src/com/reicast/emulator/emu/JNIdc.java index 4c783d2b3..02b992704 100644 --- a/shell/android/src/com/reicast/emulator/JNIdc.java +++ b/shell/android/src/com/reicast/emulator/emu/JNIdc.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.emu; public class JNIdc diff --git a/shell/android/src/com/reicast/emulator/SipEmulator.java b/shell/android/src/com/reicast/emulator/emu/SipEmulator.java similarity index 98% rename from shell/android/src/com/reicast/emulator/SipEmulator.java rename to shell/android/src/com/reicast/emulator/emu/SipEmulator.java index bb5afd88d..a20a029cc 100644 --- a/shell/android/src/com/reicast/emulator/SipEmulator.java +++ b/shell/android/src/com/reicast/emulator/emu/SipEmulator.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.emu; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/input/MOGAInput.java similarity index 96% rename from shell/android/src/com/reicast/emulator/MOGAInput.java rename to shell/android/src/com/reicast/emulator/input/MOGAInput.java index 26d46446a..8fb4be4c0 100644 --- a/shell/android/src/com/reicast/emulator/MOGAInput.java +++ b/shell/android/src/com/reicast/emulator/input/MOGAInput.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.input; /******************************************************************************/ @@ -15,6 +15,10 @@ import com.bda.controller.ControllerListener; import com.bda.controller.KeyEvent; import com.bda.controller.MotionEvent; import com.bda.controller.StateEvent; +import com.reicast.emulator.R; +import com.reicast.emulator.emu.GL2JNIActivity; +import com.reicast.emulator.emu.GL2JNIView; +import com.reicast.emulator.emu.JNIdc; /******************************************************************************/ @@ -27,12 +31,12 @@ public class MOGAInput static final int DELAY = 1000 / 50; // 50 Hz - static final int ACTION_CONNECTED = Controller.ACTION_CONNECTED; + public static final int ACTION_CONNECTED = Controller.ACTION_CONNECTED; static final int ACTION_DISCONNECTED = Controller.ACTION_DISCONNECTED; static final int ACTION_VERSION_MOGA = Controller.ACTION_VERSION_MOGA; static final int ACTION_VERSION_MOGAPRO = Controller.ACTION_VERSION_MOGAPRO; - Controller mController = null; + public Controller mController = null; private Handler handler; private String notify; @@ -107,7 +111,7 @@ public class MOGAInput */ } - protected void onCreate(Activity act) + public void onCreate(Activity act) { this.act = act; @@ -120,17 +124,17 @@ public class MOGAInput mController.setListener(new ExampleControllerListener(), new Handler()); } - protected void onDestroy() + public void onDestroy() { mController.exit(); } - protected void onPause() + public void onPause() { mController.onPause(); } - protected void onResume() + public void onResume() { mController.onResume(); diff --git a/shell/android/src/com/reicast/emulator/OnScreenMenu.java b/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java similarity index 95% rename from shell/android/src/com/reicast/emulator/OnScreenMenu.java rename to shell/android/src/com/reicast/emulator/input/OnScreenMenu.java index fdd9f4b7d..45fa65325 100644 --- a/shell/android/src/com/reicast/emulator/OnScreenMenu.java +++ b/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.input; import java.io.File; @@ -15,6 +15,12 @@ import android.widget.ImageView.ScaleType; import android.widget.LinearLayout; import android.widget.PopupWindow; +import com.reicast.emulator.MainActivity; +import com.reicast.emulator.R; +import com.reicast.emulator.config.ConfigureFragment; +import com.reicast.emulator.emu.GL2JNIActivity; +import com.reicast.emulator.emu.JNIdc; + public class OnScreenMenu { private GL2JNIActivity mContext; @@ -40,7 +46,7 @@ public class OnScreenMenu { } } - PopupWindow createPopup() { + public PopupWindow createPopup() { final PopupWindow popUp = new PopupWindow(mContext); int p = getPixelsFromDp(60, mContext); diff --git a/shell/android/src/com/reicast/emulator/VJoy.java b/shell/android/src/com/reicast/emulator/input/VJoy.java similarity index 99% rename from shell/android/src/com/reicast/emulator/VJoy.java rename to shell/android/src/com/reicast/emulator/input/VJoy.java index a516ce580..c0b6ab748 100644 --- a/shell/android/src/com/reicast/emulator/VJoy.java +++ b/shell/android/src/com/reicast/emulator/input/VJoy.java @@ -1,4 +1,4 @@ -package com.reicast.emulator; +package com.reicast.emulator.input; import android.content.Context; import android.content.SharedPreferences; From eb1772ec2cee576f43646c5a5e6c07a931474f5b Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Tue, 11 Feb 2014 23:38:27 -0500 Subject: [PATCH 2/5] Realign the native interface with the Java app counterpart --- shell/android/jni/src/Android.cpp | 114 +++++++++++++++--------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/shell/android/jni/src/Android.cpp b/shell/android/jni/src/Android.cpp index 233a6c3f8..4d4c7e931 100644 --- a/shell/android/jni/src/Android.cpp +++ b/shell/android/jni/src/Android.cpp @@ -21,114 +21,114 @@ extern "C" { - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_config(JNIEnv *env,jobject obj,jstring dirName) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_init(JNIEnv *env,jobject obj,jstring fileName) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_run(JNIEnv *env,jobject obj,jobject track) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_stop(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_config(JNIEnv *env,jobject obj,jstring dirName) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_init(JNIEnv *env,jobject obj,jstring fileName) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_run(JNIEnv *env,jobject obj,jobject track) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_stop(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); - JNIEXPORT jint JNICALL Java_com_reicast_emulator_JNIdc_send(JNIEnv *env,jobject obj,jint id, jint v) __attribute__((visibility("default"))); - JNIEXPORT jint JNICALL Java_com_reicast_emulator_JNIdc_data(JNIEnv *env,jobject obj,jint id, jbyteArray d) __attribute__((visibility("default"))); + JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_send(JNIEnv *env,jobject obj,jint id, jint v) __attribute__((visibility("default"))); + JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_data(JNIEnv *env,jobject obj,jint id, jbyteArray d) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_rendinit(JNIEnv *env,jobject obj,jint w,jint h) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_rendframe(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_rendinit(JNIEnv *env,jobject obj,jint w,jint h) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_rendframe(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_kcode(JNIEnv * env, jobject obj, jintArray k_code, jintArray l_t, jintArray r_t, jintArray jx, jintArray jy) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_vjoy(JNIEnv * env, jobject obj,u32 id,float x, float y, float w, float h) __attribute__((visibility("default"))); - //JNIEXPORT jint JNICALL Java_com_reicast_emulator_JNIdc_play(JNIEnv *env,jobject obj,jshortArray result,jint size); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_kcode(JNIEnv * env, jobject obj, jintArray k_code, jintArray l_t, jintArray r_t, jintArray jx, jintArray jy) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_vjoy(JNIEnv * env, jobject obj,u32 id,float x, float y, float w, float h) __attribute__((visibility("default"))); + //JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_play(JNIEnv *env,jobject obj,jshortArray result,jint size); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_initControllers(JNIEnv *env, jobject obj, jbooleanArray controllers) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_initControllers(JNIEnv *env, jobject obj, jbooleanArray controllers) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_setupMic(JNIEnv *env,jobject obj,jobject sip) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_vmuSwap(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupMic(JNIEnv *env,jobject obj,jobject sip) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_vmuSwap(JNIEnv *env,jobject obj) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_dynarec(JNIEnv *env,jobject obj, jint dynarec) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_idleskip(JNIEnv *env,jobject obj, jint idleskip) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_unstable(JNIEnv *env,jobject obj, jint unstable) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_cable(JNIEnv *env,jobject obj, jint cable) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_region(JNIEnv *env,jobject obj, jint region) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_broadcast(JNIEnv *env,jobject obj, jint broadcast) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_limitfps(JNIEnv *env,jobject obj, jint limiter) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_nobatch(JNIEnv *env,jobject obj, jint nobatch) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_mipmaps(JNIEnv *env,jobject obj, jint mipmaps) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_widescreen(JNIEnv *env,jobject obj, jint stretch) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_subdivide(JNIEnv *env,jobject obj, jint subdivide) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_frameskip(JNIEnv *env,jobject obj, jint frames) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_pvrrender(JNIEnv *env,jobject obj, jint render) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_cheatdisk(JNIEnv *env,jobject obj, jstring disk) __attribute__((visibility("default"))); - JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_dreamtime(JNIEnv *env,jobject obj, u32 clock) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_dynarec(JNIEnv *env,jobject obj, jint dynarec) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_idleskip(JNIEnv *env,jobject obj, jint idleskip) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_unstable(JNIEnv *env,jobject obj, jint unstable) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_cable(JNIEnv *env,jobject obj, jint cable) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_region(JNIEnv *env,jobject obj, jint region) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_broadcast(JNIEnv *env,jobject obj, jint broadcast) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_limitfps(JNIEnv *env,jobject obj, jint limiter) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nobatch(JNIEnv *env,jobject obj, jint nobatch) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_mipmaps(JNIEnv *env,jobject obj, jint mipmaps) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_widescreen(JNIEnv *env,jobject obj, jint stretch) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_subdivide(JNIEnv *env,jobject obj, jint subdivide) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_frameskip(JNIEnv *env,jobject obj, jint frames) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_pvrrender(JNIEnv *env,jobject obj, jint render) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_cheatdisk(JNIEnv *env,jobject obj, jstring disk) __attribute__((visibility("default"))); + JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_dreamtime(JNIEnv *env,jobject obj, u32 clock) __attribute__((visibility("default"))); }; -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_dynarec(JNIEnv *env,jobject obj, jint dynarec) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_dynarec(JNIEnv *env,jobject obj, jint dynarec) { settings.dynarec.Enable = dynarec; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_idleskip(JNIEnv *env,jobject obj, jint idleskip) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_idleskip(JNIEnv *env,jobject obj, jint idleskip) { settings.dynarec.idleskip = idleskip; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_unstable(JNIEnv *env,jobject obj, jint unstable) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_unstable(JNIEnv *env,jobject obj, jint unstable) { settings.dynarec.unstable_opt = unstable; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_cable(JNIEnv *env,jobject obj, jint cable) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_cable(JNIEnv *env,jobject obj, jint cable) { settings.dreamcast.cable = cable; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_region(JNIEnv *env,jobject obj, jint region) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_region(JNIEnv *env,jobject obj, jint region) { settings.dreamcast.region = region; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_broadcast(JNIEnv *env,jobject obj, jint broadcast) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_broadcast(JNIEnv *env,jobject obj, jint broadcast) { settings.dreamcast.broadcast = broadcast; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_limitfps(JNIEnv *env,jobject obj, jint limiter) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_limitfps(JNIEnv *env,jobject obj, jint limiter) { settings.aica.LimitFPS = limiter; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_nobatch(JNIEnv *env,jobject obj, jint nobatch) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_nobatch(JNIEnv *env,jobject obj, jint nobatch) { settings.aica.NoBatch = nobatch; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_mipmaps(JNIEnv *env,jobject obj, jint mipmaps) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_mipmaps(JNIEnv *env,jobject obj, jint mipmaps) { settings.rend.UseMipmaps = mipmaps; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_widescreen(JNIEnv *env,jobject obj, jint stretch) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_widescreen(JNIEnv *env,jobject obj, jint stretch) { settings.rend.WideScreen = stretch; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_subdivide(JNIEnv *env,jobject obj, jint subdivide) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_subdivide(JNIEnv *env,jobject obj, jint subdivide) { settings.pvr.subdivide_transp = subdivide; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_frameskip(JNIEnv *env,jobject obj, jint frames) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_frameskip(JNIEnv *env,jobject obj, jint frames) { settings.pvr.ta_skip = frames; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_pvrrender(JNIEnv *env,jobject obj, jint render) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_pvrrender(JNIEnv *env,jobject obj, jint render) { settings.pvr.rend = render; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_cheatdisk(JNIEnv *env,jobject obj, jstring disk) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_cheatdisk(JNIEnv *env,jobject obj, jstring disk) { } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_dreamtime(JNIEnv *env,jobject obj, u32 clock) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_dreamtime(JNIEnv *env,jobject obj, u32 clock) { settings.dreamcast.RTC = clock; } @@ -238,7 +238,7 @@ void os_SetWindowText(char const *Text) { putinf(Text); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_config(JNIEnv *env,jobject obj,jstring dirName) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_config(JNIEnv *env,jobject obj,jstring dirName) { // Set home directory based on User config const char* D = dirName? env->GetStringUTFChars(dirName,0):0; @@ -246,7 +246,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_config(JNIEnv *env,jobjec printf("Home dir is: '%s'\n",GetPath("/").c_str()); env->ReleaseStringUTFChars(dirName,D); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_init(JNIEnv *env,jobject obj,jstring fileName) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_init(JNIEnv *env,jobject obj,jstring fileName) { // Get filename string from Java @@ -290,7 +290,7 @@ jobject track; jobject sipemu; jmethodID getmicdata; -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_run(JNIEnv *env,jobject obj,jobject trk) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_run(JNIEnv *env,jobject obj,jobject trk) { install_prof_handler(0); @@ -303,7 +303,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_run(JNIEnv *env,jobject o dc_run(); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_setupMic(JNIEnv *env,jobject obj,jobject sip) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_setupMic(JNIEnv *env,jobject obj,jobject sip) { sipemu = env->NewGlobalRef(sip); getmicdata = env->GetMethodID(env->GetObjectClass(sipemu),"getData","()[B"); @@ -311,12 +311,12 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_setupMic(JNIEnv *env,jobj mcfg_Create(MDT_Microphone,0,1); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_stop(JNIEnv *env,jobject obj) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_stop(JNIEnv *env,jobject obj) { dc_term(); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_vmuSwap(JNIEnv *env,jobject obj) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_vmuSwap(JNIEnv *env,jobject obj) { LOGD("vmuSwap go!"); @@ -333,7 +333,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_vmuSwap(JNIEnv *env,jobje } -JNIEXPORT jint JNICALL Java_com_reicast_emulator_JNIdc_send(JNIEnv *env,jobject obj,jint cmd, jint param) +JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_send(JNIEnv *env,jobject obj,jint cmd, jint param) { if (cmd==0) { @@ -366,7 +366,7 @@ JNIEXPORT jint JNICALL Java_com_reicast_emulator_JNIdc_send(JNIEnv *env,jobject } } -JNIEXPORT jint JNICALL Java_com_reicast_emulator_JNIdc_data(JNIEnv *env,jobject obj,jint id, jbyteArray d) +JNIEXPORT jint JNICALL Java_com_reicast_emulator_emu_JNIdc_data(JNIEnv *env,jobject obj,jint id, jbyteArray d) { if (id==1) { @@ -380,12 +380,12 @@ JNIEXPORT jint JNICALL Java_com_reicast_emulator_JNIdc_data(JNIEnv *env,jobject } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_rendframe(JNIEnv *env,jobject obj) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_rendframe(JNIEnv *env,jobject obj) { while(!rend_single_frame()) ; } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_kcode(JNIEnv * env, jobject obj, jintArray k_code, jintArray l_t, jintArray r_t, jintArray jx, jintArray jy) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_kcode(JNIEnv * env, jobject obj, jintArray k_code, jintArray l_t, jintArray r_t, jintArray jx, jintArray jy) { jint *k_code_body = env->GetIntArrayElements(k_code, 0); jint *l_t_body = env->GetIntArrayElements(l_t, 0); @@ -409,7 +409,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_kcode(JNIEnv * env, jobje env->ReleaseIntArrayElements(jy, jy_body, 0); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_rendinit(JNIEnv * env, jobject obj, jint w,jint h) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_rendinit(JNIEnv * env, jobject obj, jint w,jint h) { screen_width = w; screen_height = h; @@ -424,7 +424,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_rendinit(JNIEnv * env, jo install_prof_handler(1); } -JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_vjoy(JNIEnv * env, jobject obj,u32 id,float x, float y, float w, float h) +JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_vjoy(JNIEnv * env, jobject obj,u32 id,float x, float y, float w, float h) { if(idGetBooleanArrayElements(controllers, 0); memcpy(add_controllers, controllers_body, 3); From 1e798727d300e04cb32bafb5547847e767d9b959 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Tue, 11 Feb 2014 23:40:37 -0500 Subject: [PATCH 3/5] Reduce the number of packages, Input is really emu stuff --- .../src/com/reicast/emulator/config/EditVJoyActivity.java | 4 ++-- .../src/com/reicast/emulator/config/InputFragment.java | 2 +- .../android/src/com/reicast/emulator/emu/GL2JNIActivity.java | 2 -- shell/android/src/com/reicast/emulator/emu/GL2JNIView.java | 1 - .../src/com/reicast/emulator/{input => emu}/MOGAInput.java | 5 +---- .../com/reicast/emulator/{input => emu}/OnScreenMenu.java | 4 +--- .../src/com/reicast/emulator/{input => emu}/VJoy.java | 2 +- 7 files changed, 6 insertions(+), 14 deletions(-) rename shell/android/src/com/reicast/emulator/{input => emu}/MOGAInput.java (98%) rename shell/android/src/com/reicast/emulator/{input => emu}/OnScreenMenu.java (98%) rename shell/android/src/com/reicast/emulator/{input => emu}/VJoy.java (99%) diff --git a/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java index e53997057..01a5a7fff 100644 --- a/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java +++ b/shell/android/src/com/reicast/emulator/config/EditVJoyActivity.java @@ -22,8 +22,8 @@ import com.reicast.emulator.MainActivity; import com.reicast.emulator.R; import com.reicast.emulator.emu.GL2JNIView; import com.reicast.emulator.emu.JNIdc; -import com.reicast.emulator.input.OnScreenMenu; -import com.reicast.emulator.input.VJoy; +import com.reicast.emulator.emu.OnScreenMenu; +import com.reicast.emulator.emu.VJoy; @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) public class EditVJoyActivity extends Activity { diff --git a/shell/android/src/com/reicast/emulator/config/InputFragment.java b/shell/android/src/com/reicast/emulator/config/InputFragment.java index e5b33370a..ca46c0049 100644 --- a/shell/android/src/com/reicast/emulator/config/InputFragment.java +++ b/shell/android/src/com/reicast/emulator/config/InputFragment.java @@ -31,7 +31,7 @@ import com.bda.controller.MotionEvent; import com.bda.controller.StateEvent; import com.reicast.emulator.MainActivity; import com.reicast.emulator.R; -import com.reicast.emulator.input.MOGAInput; +import com.reicast.emulator.emu.MOGAInput; import de.ankri.views.Switch; diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java index be1aa0c85..0c906739b 100644 --- a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java @@ -25,8 +25,6 @@ import android.widget.Toast; import com.reicast.emulator.R; import com.reicast.emulator.config.ConfigureFragment; -import com.reicast.emulator.input.MOGAInput; -import com.reicast.emulator.input.OnScreenMenu; @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) public class GL2JNIActivity extends Activity { diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java index 4b982ba4d..c3bfa9833 100644 --- a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java @@ -29,7 +29,6 @@ import android.view.ScaleGestureDetector.SimpleOnScaleGestureListener; import android.view.View; import com.reicast.emulator.MainActivity; -import com.reicast.emulator.input.VJoy; /** diff --git a/shell/android/src/com/reicast/emulator/input/MOGAInput.java b/shell/android/src/com/reicast/emulator/emu/MOGAInput.java similarity index 98% rename from shell/android/src/com/reicast/emulator/input/MOGAInput.java rename to shell/android/src/com/reicast/emulator/emu/MOGAInput.java index 8fb4be4c0..c8dc7fb7b 100644 --- a/shell/android/src/com/reicast/emulator/input/MOGAInput.java +++ b/shell/android/src/com/reicast/emulator/emu/MOGAInput.java @@ -1,4 +1,4 @@ -package com.reicast.emulator.input; +package com.reicast.emulator.emu; /******************************************************************************/ @@ -16,9 +16,6 @@ import com.bda.controller.KeyEvent; import com.bda.controller.MotionEvent; import com.bda.controller.StateEvent; import com.reicast.emulator.R; -import com.reicast.emulator.emu.GL2JNIActivity; -import com.reicast.emulator.emu.GL2JNIView; -import com.reicast.emulator.emu.JNIdc; /******************************************************************************/ diff --git a/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java similarity index 98% rename from shell/android/src/com/reicast/emulator/input/OnScreenMenu.java rename to shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java index 45fa65325..b73fffcb6 100644 --- a/shell/android/src/com/reicast/emulator/input/OnScreenMenu.java +++ b/shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java @@ -1,4 +1,4 @@ -package com.reicast.emulator.input; +package com.reicast.emulator.emu; import java.io.File; @@ -18,8 +18,6 @@ import android.widget.PopupWindow; import com.reicast.emulator.MainActivity; import com.reicast.emulator.R; import com.reicast.emulator.config.ConfigureFragment; -import com.reicast.emulator.emu.GL2JNIActivity; -import com.reicast.emulator.emu.JNIdc; public class OnScreenMenu { diff --git a/shell/android/src/com/reicast/emulator/input/VJoy.java b/shell/android/src/com/reicast/emulator/emu/VJoy.java similarity index 99% rename from shell/android/src/com/reicast/emulator/input/VJoy.java rename to shell/android/src/com/reicast/emulator/emu/VJoy.java index c0b6ab748..fdb60cadf 100644 --- a/shell/android/src/com/reicast/emulator/input/VJoy.java +++ b/shell/android/src/com/reicast/emulator/emu/VJoy.java @@ -1,4 +1,4 @@ -package com.reicast.emulator.input; +package com.reicast.emulator.emu; import android.content.Context; import android.content.SharedPreferences; From 24c4c049455f53c58965d023928c0573ead60232 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 12 Feb 2014 02:32:23 -0500 Subject: [PATCH 4/5] Allow menu interaction before immersive overlay recedes --- .../src/com/reicast/emulator/emu/GL2JNIActivity.java | 12 ++++++++++-- .../src/com/reicast/emulator/emu/GL2JNIView.java | 2 -- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java index 0c906739b..65ba5f6d9 100644 --- a/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIActivity.java @@ -473,13 +473,21 @@ public class GL2JNIActivity extends Activity { } public void displayPopUp(PopupWindow popUp) { - popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 60); + } else { + popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0); + } popUp.update(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); } public void displayConfig(PopupWindow popUpConfig) { - popUpConfig.showAtLocation(mView, Gravity.BOTTOM, 0, 0); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + popUpConfig.showAtLocation(mView, Gravity.BOTTOM, 0, 60); + } else { + popUpConfig.showAtLocation(mView, Gravity.BOTTOM, 0, 0); + } popUpConfig.update(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT); } diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java index c3bfa9833..252fcaba4 100644 --- a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java @@ -105,8 +105,6 @@ public class GL2JNIView extends GLSurfaceView Runtime.getRuntime().freeMemory(); System.gc(); - - Thread.currentThread().setPriority(Thread.MAX_PRIORITY); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); touchVibrationEnabled = prefs.getBoolean("touch_vibration_enabled", true); From 4368f327aeebea97704c56c2c4786249b5a416e5 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 12 Feb 2014 16:17:27 -0500 Subject: [PATCH 5/5] Add permanent sound option, Split debug into menu, Clean --- .../android/res/layout/configure_fragment.xml | 194 +++++++++++------- shell/android/res/values/strings.xml | 2 + .../emulator/config/ConfigureFragment.java | 18 ++ .../reicast/emulator/emu/GL2JNIActivity.java | 10 + .../com/reicast/emulator/emu/GL2JNIView.java | 15 +- .../reicast/emulator/emu/OnScreenMenu.java | 143 ++++++++----- 6 files changed, 258 insertions(+), 124 deletions(-) diff --git a/shell/android/res/layout/configure_fragment.xml b/shell/android/res/layout/configure_fragment.xml index 406174f12..b632f85e3 100644 --- a/shell/android/res/layout/configure_fragment.xml +++ b/shell/android/res/layout/configure_fragment.xml @@ -39,7 +39,7 @@ android:id="@+id/unstable_option" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:focusable="true" /> + android:focusable="true" /> @@ -135,6 +135,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -166,6 +269,19 @@ android:layout_marginTop="10dp" android:gravity="center_vertical" > +