Merge lp:~oif-team/evemu/trunk.realtime into lp:evemu

[Henrik Rydberg]

Adding the useful evemu_read_event_realtime(), simplifying the implementation a bit, and helping further the frame, grail and python projects.

[Chase Douglas (chasedouglas)]

Looks good to me.

review: Approve

=== modified file 'include/evemu.h'
--- include/evemu.h	2011-02-03 02:29:13 +0000
+++ include/evemu.h	2011-03-14 17:17:08 +0000
@@ -76,6 +76,8 @@
 
 int evemu_write_event(FILE *fp, const struct input_event *ev);
 int evemu_read_event(FILE *fp, struct input_event *ev);
+int evemu_read_event_realtime(FILE *fp, struct input_event *ev,
+			      struct timeval *evtime);
 
 int evemu_record(FILE *fp, int fd, int ms);
 int evemu_play(FILE *fp, int fd);

=== modified file 'src/evemu.c'
--- src/evemu.c	2011-02-03 02:29:13 +0000
+++ src/evemu.c	2011-03-14 17:17:08 +0000
@@ -361,24 +361,39 @@
 	return ret;
 }
 
+int evemu_read_event_realtime(FILE *fp, struct input_event *ev,
+			      struct timeval *evtime)
+{
+	unsigned long usec;
+	int ret;
+
+	ret = evemu_read_event(fp, ev);
+	if (ret <= 0)
+		return ret;
+
+	if (evtime) {
+		if (!evtime->tv_sec)
+			*evtime = ev->time;
+		usec = 1000000L * (ev->time.tv_sec - evtime->tv_sec);
+		usec += ev->time.tv_usec - evtime->tv_usec;
+		if (usec > 500) {
+			usleep(usec);
+			*evtime = ev->time;
+		}
+	}
+
+	return ret;
+}
+
 int evemu_play(FILE *fp, int fd)
 {
-	struct input_event prev, ev;
-	long check = 0, usec;
+	struct input_event ev;
+	struct timeval evtime;
 	int ret;
 
-	memset(&prev, 0, sizeof(prev));
-	while (evemu_read_event(fp, &ev) > 0) {
-		if (!prev.time.tv_sec)
-			prev = ev;
-		usec = 1000000L * (ev.time.tv_sec - prev.time.tv_sec);
-		usec += ev.time.tv_usec - prev.time.tv_usec;
-		if (usec - check > 500) {
-			usleep(usec - check);
-			check = usec;
-		}
+	memset(&evtime, 0, sizeof(evtime));
+	while (evemu_read_event_realtime(fp, &ev, &evtime) > 0)
 		SYSCALL(ret = write(fd, &ev, sizeof(ev)));
-	}
 
 	return 0;
 }