X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fjogshuttle.cpp;h=04ee736082d3923942696297196f4998975d63e0;hb=400911277ef75457aabf0a2c020096cfec093cc2;hp=fd32153026a4425da4ff97612060d16aad057886;hpb=ef18c87989e06fb13f0998771cbc116566468016;p=kdenlive

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index fd321530..04ee7360 100644
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -31,6 +31,8 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <string.h>
 #include <linux/input.h>
 
 #define DELAY 10
@@ -88,7 +90,7 @@ void ShuttleThread::run()
 	/* open file descriptor */
 	const int fd = KDE_open((char *) m_device.toUtf8().data(), O_RDONLY);
 	if (fd < 0) {
-		fprintf(stderr, "Can't open Jog Shuttle FILE DESCRIPTOR\n");
+		perror("Can't open Jog Shuttle FILE DESCRIPTOR");
 		return;
 	}
 
@@ -103,9 +105,18 @@ void ShuttleThread::run()
 	fd_set		   readset;
 	struct timeval timeout;
 
-	int num_warnings = 0;
+	int num_warnings, readResult = 0;
 	int result, iof = -1;
 
+	/* get fd settings */
+	if ((iof = fcntl(fd, F_GETFL, 0)) != -1) {
+		/* set fd non blocking */
+		fcntl(fd, F_SETFL, iof | O_NONBLOCK);
+	} else {
+		fprintf(stderr, "Can't set Jog Shuttle FILE DESCRIPTOR to O_NONBLOCK and stop thread\n");
+		return;
+	}
+
 	/* enter thread loop */
 	while (!stop_me) {
 		/* reset the read set */
@@ -114,45 +125,55 @@ void ShuttleThread::run()
 
 		/* reinit the timeout structure */
 		timeout.tv_sec  = 0;
-		timeout.tv_usec = 300000; /* 300 ms */
+		timeout.tv_usec = 400000; /* 400 ms */
 
-		/* do the select */
+		/* do select in blocked mode and wake up after timeout for eval stop_me */
 		result = select(fd+1, &readset, NULL, NULL, &timeout);
 
-		/* see if there was an error or timeout */
-		if (result < 0) {
-			// perror("select failed");
+		/* see if there was an error or timeout else process event */
+		if (result < 0 && errno == EINTR) {
+			/* EINTR event catched. This is not a problem - continue processing */
+			kDebug() << strerror(errno) << "\n";
+			/* continue processing */
+			continue;
+		} else if (result < 0) {
+			/* stop thread */
+			stop_me = true;
+			kDebug() << strerror(errno) << "\n";
 		} else if (result == 0) {
-			//puts("TIMEOUT");
+			/* do nothing. reserved for future purposes */
 		} else {
 			/* we have input */
 			if (FD_ISSET(fd, &readset)) {
-				/* get fd settings */
-				if ((iof = fcntl(fd, F_GETFL, 0)) != -1) {
-					/* set fd non blocking */
-					fcntl(fd, F_SETFL, iof | O_NONBLOCK);
-					/* read input */
-					if (read(fd, &ev, sizeof(ev)) < 0) {
-						if (num_warnings % 10000 == 0)
-							/* should not happen cause select called before */
-							fprintf(stderr, "Failed to read event from Jog Shuttle FILE DESCRIPTOR (repeated %d times)\n", num_warnings + 1);
-						num_warnings++;
+				/* read input */
+				readResult = read(fd, &ev, sizeof(ev));
+				if (readResult < 0) {
+					if (num_warnings % 10000 == 0) {
+						/* if device is not available anymore - dead or disconnected */
+						fprintf(stderr, "Failed to read event from Jog Shuttle FILE DESCRIPTOR (repeated %d times)\n", num_warnings + 1);
 					}
-
-					/* restore settings */
-					if (iof != -1) {
-						fcntl(fd, F_SETFL, iof);
+					/* exit if device is not available or the error occurs to long */
+					if (errno == ENODEV) {
+						perror("Failed to read from Jog Shuttle FILE DESCRIPTOR. Stop thread");
+						/* stop thread */
+						stop_me = true;
+					} else if (num_warnings > 1000000) {
+						perror("Failed to read from Jog Shuttle FILE DESCRIPTOR. Limit reached. Stop thread");
+						/* stop thread */
+						stop_me = true;
 					}
+					num_warnings++;
+				} else if (readResult == sizeof(ev)) {
 					/* process event */
 					handle_event(ev);
 				} else {
-					fprintf(stderr, "Can't set Jog Shuttle FILE DESCRIPTOR to O_NONBLOCK\n");
-					stop_me = true;
+					fprintf(stderr, "Read nr of bytes != sizeof(ev)\n");
 				}
 			}
 		}
 	}
 
+//	kDebug() << "Close thread" << "\n";
 	/* close the handle and return thread */
 	close(fd);
 }
@@ -184,7 +205,7 @@ void ShuttleThread::key(unsigned short code, unsigned int value)
     if (code > 16)
         return;
 
-    kDebug() << "Button PRESSED: " << code;
+    //kDebug() << "Button PRESSED: " << code;
     QApplication::postEvent(m_parent, new QEvent((QEvent::Type)(KEY_EVENT_OFFSET + code)));
 
 }