From 41bccaa7324b6b3a056757601d746d70355c47ca Mon Sep 17 00:00:00 2001
From: Simon <simonbrown77@googlemail.com>
Date: Sun, 2 May 2021 11:58:30 +0100
Subject: [PATCH] More fixes for use of service

---
 .../Android/jni/QzDoom/QzDoom_SurfaceView.c   | 21 ---------------
 .../drbeef/questzdoom/GLES3JNIActivity.java   | 26 -------------------
 2 files changed, 47 deletions(-)

diff --git a/Projects/Android/jni/QzDoom/QzDoom_SurfaceView.c b/Projects/Android/jni/QzDoom/QzDoom_SurfaceView.c
index 8c895e6..afc9074 100644
--- a/Projects/Android/jni/QzDoom/QzDoom_SurfaceView.c
+++ b/Projects/Android/jni/QzDoom/QzDoom_SurfaceView.c
@@ -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_stopevent(const char* event);
-void jni_haptic_stopall();
 void jni_haptic_enable();
 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)
 {
 	jni_haptic_stopevent(event);
@@ -1766,7 +1760,6 @@ Activity lifecycle
 jmethodID android_shutdown;
 jmethodID android_haptic_event;
 jmethodID android_haptic_stopevent;
-jmethodID android_haptic_stopall;
 jmethodID android_haptic_enable;
 jmethodID android_haptic_disable;
 static JavaVM *jVM;
@@ -1815,19 +1808,6 @@ void jni_haptic_stopevent(const char* event)
 	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()
 {
 	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_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_stopall = (*env)->GetMethodID(env, callbackClass, "haptic_stopall", "()V");
 	android_haptic_enable = (*env)->GetMethodID(env, callbackClass, "haptic_enable", "()V");
 	android_haptic_disable = (*env)->GetMethodID(env, callbackClass, "haptic_disable", "()V");
 
diff --git a/java/com/drbeef/questzdoom/GLES3JNIActivity.java b/java/com/drbeef/questzdoom/GLES3JNIActivity.java
index 3d8e9ac..1f2f0c0 100644
--- a/java/com/drbeef/questzdoom/GLES3JNIActivity.java
+++ b/java/com/drbeef/questzdoom/GLES3JNIActivity.java
@@ -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) {
 
 		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() {
 
 		if (externalHapticsServiceClient.hasService()) {