Add:android:Made watches more flexible

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4929 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 4 insertions, 20 deletions

diff --git a/navit/android.c b/navit/android.c
index eec4005a8..1107f600c 100644
--- a/navit/android.c
+++ b/navit/android.c
@@ -1,6 +1,5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <poll.h>
 #include <glib.h>
 #include "android.h"
 #include <android/log.h>
@@ -142,26 +141,11 @@ Java_org_navitproject_navit_NavitIdle_IdleCallback( JNIEnv* env, jobject thiz, i
 }
 
 JNIEXPORT void JNICALL
-Java_org_navitproject_navit_NavitWatch_poll( JNIEnv* env, jobject thiz, int fd, int cond)
+Java_org_navitproject_navit_NavitWatch_poll( JNIEnv* env, jobject thiz, int func, int fd, int cond)
 {
-	struct pollfd pfd;
-	pfd.fd=fd;
-	dbg(1,"%p poll called for %d %d\n",env, fd, cond);
-	switch ((enum event_watch_cond)cond) {
-	case event_watch_cond_read:
-		pfd.events=POLLIN;
-		break;
-	case event_watch_cond_write:
-		pfd.events=POLLOUT;
-		break;
-	case event_watch_cond_except:
-		pfd.events=POLLERR;
-		break;
-	default:
-		pfd.events=0;
-	}
-	pfd.revents=0;
-	poll(&pfd, 1, -1);
+	void (*pollfunc)(JNIEnv *env, int fd, int cond)=(void *)func;
+
+	pollfunc(env, fd, cond);
 }
 
 JNIEXPORT void JNICALL