teambeef/questzdoom
0
0
Fork 0
mirror of https://github.com/DrBeef/QuestZDoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

More fixes for use of service

Browse source
This commit is contained in:
Simon 2021-05-02 11:58:30 +01:00
parent 57ad6aed7a
commit d185b1873b
2 changed files with 0 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Projects/Android/jni/QzDoom/QzDoom_SurfaceView.c
View file

@ -878,7 +878,6 @@ void QzDoom_Vibrate(float duration, int channel, float intensity )
void jni_haptic_event(const char* event, int position, int intensity, float angle, float yHeight); void jni_haptic_event(const char* event, int position, int intensity, float angle, float yHeight);
void jni_haptic_stopevent(const char* event); void jni_haptic_stopevent(const char* event);
void jni_haptic_stopall();
void jni_haptic_enable(); void jni_haptic_enable();
void jni_haptic_disable(); void jni_haptic_disable();
@ -890,11 +889,6 @@ void QzDoom_HapticEvent(const char* event, int position, int intensity, float an
} }
} }
void QzDoom_HapticStopAll()
{
jni_haptic_stopall();
}
void QzDoom_HapticStopEvent(const char* event) void QzDoom_HapticStopEvent(const char* event)
{ {
jni_haptic_stopevent(event); jni_haptic_stopevent(event);
@ -1766,7 +1760,6 @@ Activity lifecycle
jmethodID android_shutdown; jmethodID android_shutdown;
jmethodID android_haptic_event; jmethodID android_haptic_event;
jmethodID android_haptic_stopevent; jmethodID android_haptic_stopevent;
jmethodID android_haptic_stopall;
jmethodID android_haptic_enable; jmethodID android_haptic_enable;
jmethodID android_haptic_disable; jmethodID android_haptic_disable;
static JavaVM *jVM; static JavaVM *jVM;
@ -1815,19 +1808,6 @@ void jni_haptic_stopevent(const char* event)
return (*env)->CallVoidMethod(env, jniCallbackObj, android_haptic_stopevent, StringArg1); return (*env)->CallVoidMethod(env, jniCallbackObj, android_haptic_stopevent, StringArg1);
} }
void jni_haptic_stopall()
{
ALOGV("Calling: jni_haptic_stopall");
JNIEnv *env;
jobject tmp;
if (((*jVM)->GetEnv(jVM, (void**) &env, JNI_VERSION_1_4))<0)
{
(*jVM)->AttachCurrentThread(jVM,&env, NULL);
}
return (*env)->CallVoidMethod(env, jniCallbackObj, android_haptic_stopall);
}
void jni_haptic_enable() void jni_haptic_enable()
{ {
ALOGV("Calling: jni_haptic_enable"); ALOGV("Calling: jni_haptic_enable");
@ -1959,7 +1939,6 @@ JNIEXPORT void JNICALL Java_com_drbeef_questzdoom_GLES3JNILib_onStart( JNIEnv *
android_shutdown = (*env)->GetMethodID(env,callbackClass,"shutdown","()V"); android_shutdown = (*env)->GetMethodID(env,callbackClass,"shutdown","()V");
android_haptic_event = (*env)->GetMethodID(env, callbackClass, "haptic_event", "(Ljava/lang/String;IIFF)V"); android_haptic_event = (*env)->GetMethodID(env, callbackClass, "haptic_event", "(Ljava/lang/String;IIFF)V");
android_haptic_stopevent = (*env)->GetMethodID(env, callbackClass, "haptic_stopevent", "(Ljava/lang/String;)V"); android_haptic_stopevent = (*env)->GetMethodID(env, callbackClass, "haptic_stopevent", "(Ljava/lang/String;)V");
android_haptic_stopall = (*env)->GetMethodID(env, callbackClass, "haptic_stopall", "()V");
android_haptic_enable = (*env)->GetMethodID(env, callbackClass, "haptic_enable", "()V"); android_haptic_enable = (*env)->GetMethodID(env, callbackClass, "haptic_enable", "()V");
android_haptic_disable = (*env)->GetMethodID(env, callbackClass, "haptic_disable", "()V"); android_haptic_disable = (*env)->GetMethodID(env, callbackClass, "haptic_disable", "()V");

26
java/com/drbeef/questzdoom/GLES3JNIActivity.java
View file

@ -68,19 +68,6 @@ import java.io.OutputStream;
} }
} }
public void haptic_updateevent(String event, int intensity, float angle) {
if (externalHapticsServiceClient.hasService()) {
try {
externalHapticsServiceClient.getHapticsService().hapticUpdateEvent(APPLICATION, event, intensity, angle);
}
catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
}
}
}
public void haptic_stopevent(String event) { public void haptic_stopevent(String event) {
if (externalHapticsServiceClient.hasService()) { if (externalHapticsServiceClient.hasService()) {
@ -94,19 +81,6 @@ import java.io.OutputStream;
} }
} }
public void haptic_endframe() {
if (externalHapticsServiceClient.hasService()) {
try {
externalHapticsServiceClient.getHapticsService().hapticFrameTick();
}
catch (RemoteException r)
{
Log.v(APPLICATION, r.toString());
}
}
}
public void haptic_enable() { public void haptic_enable() {
if (externalHapticsServiceClient.hasService()) { if (externalHapticsServiceClient.hasService()) {