X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fin_tsbutton.c;h=84d6895c7cb4d4fc87702904d2352cd2ededde27;hp=4e2cef027ba4e2bac10ce0df2a64a98e8c7b7c22;hb=50306d8d6e20ede70c2dea274ae1099082aea88f;hpb=90f1c767f07b95fe39a344eaa96f629cd7efe1ba

diff --git a/frontend/in_tsbutton.c b/frontend/in_tsbutton.c
index 4e2cef02..84d6895c 100644
--- a/frontend/in_tsbutton.c
+++ b/frontend/in_tsbutton.c
@@ -12,6 +12,7 @@
 #include <tslib.h>
 
 #include "common/input.h"
+#include "pl_gun_ts.h"
 #include "in_tsbutton.h"
 
 #define IN_TSBUTTON_PREFIX "tsbutton:"
@@ -24,8 +25,6 @@ static int last_tsbutton_id;
 
 // HACK: stealing this from plugin_lib
 extern void *tsdev;
-extern int (*pts_read)(struct tsdev *dev, struct ts_sample *sample, int nr);
-extern int (*pts_fd)(struct tsdev *dev);
 
 static const char * const in_tsbutton_keys[IN_TSBUTTON_COUNT] = {
 	"TS1", "TS2", "TS3", "TS4",
@@ -40,7 +39,7 @@ static void in_tsbutton_probe(void)
 	}
 
 	in_register(IN_TSBUTTON_PREFIX "touchscreen as buttons",
-		pts_fd(dev), NULL, IN_TSBUTTON_COUNT, in_tsbutton_keys, 0);
+		pl_gun_ts_get_fd(dev), NULL, IN_TSBUTTON_COUNT, in_tsbutton_keys, 0);
 }
 
 static const char * const *
@@ -53,20 +52,12 @@ in_tsbutton_get_key_names(int *count)
 static int update_button(void)
 {
 	struct tsdev *dev = tsdev;
-	struct ts_sample sample;
-	int sx = 0, sy = 0, sp = 0, updated = 0;
+	int sx = 0, sy = 0, sp = 0;
 
 	if (dev == NULL)
 		return -1;
 
-	while (pts_read(dev, &sample, 1) > 0) {
-		sx = sample.x;
-		sy = sample.y;
-		sp = sample.pressure;
-		updated = 1;
-	}
-
-	if (updated) {
+	if (pl_gun_ts_update_raw(dev, &sx, &sy, &sp)) {
 		if (sp == 0)
 			tsbutton_down_id = -1;
 		else {