mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 03:40:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android/Phoenix) remove remnants

Browse Source
This commit is contained in:
twinaphex 2012-12-24 15:23:06 +01:00
parent e5e58912c1
commit 480e36000e
2 changed files with 1 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
android/native/jni/input_android.c
View File

@ -298,36 +298,6 @@ static void *android_input_init(void)
return (void*)-1;
}
#if 0
static void android_input_get_devicename(int id, struct jni_params *params, struct jni_out_params_char *out_params)
{
JNIEnv *env;
JavaVM *vm = params->java_vm;
(*vm)->AttachCurrentThread(vm, &env, 0);
jclass clazz = (*env)->FindClass(env, "org.retroarch.browser.ModuleActivity");
jmethodID giid = (*env)->GetMethodID(env, clazz, params->method_name, params->method_signature);
jobject obj = (*env)->CallObjectMethod(env, params->class_obj, giid); //Got our object
jclass class_obj = (*env)->GetObjectClass(env, obj); //class pointer of object
jmethodID gseid = (*env)->GetMethodID(env, class_obj, params->obj_method_name, params->obj_method_signature);
jstring jsParam1 = (*env)->CallObjectMethod(env, obj, gseid, (*env)->NewStringUTF(env, out_params->in));
const char *test_argv = (*env)->GetStringUTFChars(env, jsParam1, 0);
strncpy(out_params->out, test_argv, out_params->out_sizeof);
(*env)->ReleaseStringUTFChars(env, jsParam1, test_argv);
(*vm)->DetachCurrentThread(vm);
}
#endif
static void android_input_poll(void *data)
{
(void)data;
@ -354,25 +324,6 @@ static void android_input_poll(void *data)
int source = AInputEvent_getSource(event);
int id = AInputEvent_getDeviceId(event);
#if 0
char devicename[512];
struct jni_out_params_char out_args;
struct jni_params jni_args;
jni_args.java_vm = g_android.app->activity->vm;
snprintf(jni_args.method_name, sizeof(jni_args.method_name), "getDeviceName");
snprintf(jni_args.method_signature, sizeof(jni_args.method_signature), "(Ljava/lang/String;)Ljava/lang/String;");
out_args.out = devicename;
out_args.out_sizeof = sizeof(devicename);
android_input_get_devicename(id, &jni_args, &out_args);
RARCH_LOG("Device name: %s\n", out_args.out);
#endif
int type_event = AInputEvent_getType(event);
int state_id = state_device_ids[id];

12
android/phoenix/src/org/retroarch/browser/ModuleActivity.java
View File

@ -48,15 +48,6 @@ public class ModuleActivity extends Activity implements AdapterView.OnItemClickL
static private final int ACTIVITY_LOAD_ROM = 0;
static private String libretro_path;
public String getDeviceName(int id)
{
final String name = InputDevice.getDevice(7).getName();
if(name != null)
return name;
else
return "";
}
public float getRefreshRate()
{
final WindowManager wm = (WindowManager)getSystemService(Context.WINDOW_SERVICE);
@ -116,8 +107,7 @@ public class ModuleActivity extends Activity implements AdapterView.OnItemClickL
case ACTIVITY_LOAD_ROM:
if(data.getStringExtra("PATH") != null)
{
Toast.makeText(this, "Loading: ["+ data.getStringExtra("PATH") + "]...", Toast.LENGTH_SHORT).show();
//Toast.makeText(this, getDeviceName(5), Toast.LENGTH_SHORT).show();
Toast.makeText(this, "Loading: ["+ data.getStringExtra("PATH") + "]...", Toast.LENGTH_SHORT).show();
myIntent = new Intent(this, NativeActivity.class);
myIntent.putExtra("ROM", data.getStringExtra("PATH"));
myIntent.putExtra("LIBRETRO", libretro_path);