X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fjogshuttle.cpp;h=fd32153026a4425da4ff97612060d16aad057886;hb=ef18c87989e06fb13f0998771cbc116566468016;hp=16fd171f4d0e17ce80a982a84c1647716de610db;hpb=60eb4b82541e1560403e52c2d078c0b4b100de7d;p=kdenlive

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index 16fd171f..fd321530 100644
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -84,32 +84,77 @@ bool ShuttleThread::isWorking()
 
 void ShuttleThread::run()
 {
-    kDebug() << "-------  STARTING SHUTTLE: " << m_device;
+	kDebug() << "-------  STARTING SHUTTLE: " << m_device;
+	/* 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");
+		return;
+	}
 
-    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");
-        return;;
-    }
-    EV ev;
+	EV ev;
 
-    if (ioctl(fd, EVIOCGRAB, 1) < 0) {
-        fprintf(stderr, "Can't get exclusive access on  Jog Shuttle FILE DESCRIPTOR\n");
-        close(fd);
-        return;;
-    }
+	if (ioctl(fd, EVIOCGRAB, 1) < 0) {
+		fprintf(stderr, "Can't get exclusive access on  Jog Shuttle FILE DESCRIPTOR\n");
+		close(fd);
+		return;
+	}
 
-    int num_warnings = 0;
-    while (!stop_me) {
-        if (read(fd, &ev, sizeof(ev)) < 0) {
-            if (num_warnings % 10000 == 0)
-                fprintf(stderr, "Failed to read event from Jog Shuttle FILE DESCRIPTOR (repeated %d times)\n", num_warnings + 1);
-            num_warnings++;
-        }
-        handle_event(ev);
-    }
-    close(fd);
+	fd_set		   readset;
+	struct timeval timeout;
+
+	int num_warnings = 0;
+	int result, iof = -1;
+
+	/* enter thread loop */
+	while (!stop_me) {
+		/* reset the read set */
+		FD_ZERO(&readset);
+		FD_SET(fd, &readset);
+
+		/* reinit the timeout structure */
+		timeout.tv_sec  = 0;
+		timeout.tv_usec = 300000; /* 300 ms */
+
+		/* do the select */
+		result = select(fd+1, &readset, NULL, NULL, &timeout);
+
+		/* see if there was an error or timeout */
+		if (result < 0) {
+			// perror("select failed");
+		} else if (result == 0) {
+			//puts("TIMEOUT");
+		} 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++;
+					}
+
+					/* restore settings */
+					if (iof != -1) {
+						fcntl(fd, F_SETFL, iof);
+					}
+					/* process event */
+					handle_event(ev);
+				} else {
+					fprintf(stderr, "Can't set Jog Shuttle FILE DESCRIPTOR to O_NONBLOCK\n");
+					stop_me = true;
+				}
+			}
+		}
+	}
 
+	/* close the handle and return thread */
+	close(fd);
 }
 
 void ShuttleThread::handle_event(EV ev)
@@ -207,7 +252,7 @@ JogShuttle::JogShuttle(QString device, QObject *parent) :
 
 JogShuttle::~JogShuttle()
 {
-    if (m_shuttleProcess.isRunning()) m_shuttleProcess.exit();
+	stopDevice();
 }
 
 void JogShuttle::initDevice(QString device)
@@ -222,8 +267,19 @@ void JogShuttle::initDevice(QString device)
 
 void JogShuttle::stopDevice()
 {
-    if (m_shuttleProcess.isRunning())
+    if (m_shuttleProcess.isRunning()) {
+    	/* tell thread to stop */
         m_shuttleProcess.stop_me = true;
+        m_shuttleProcess.exit();
+        /* give the thread some time (ms) to shutdown */
+        m_shuttleProcess.wait(600);
+
+        /* if still running - do it in the hardcore way */
+        if (m_shuttleProcess.isRunning()) {
+        	m_shuttleProcess.terminate();
+            kDebug() << "/// terminate jogshuttle process\n";
+        }
+    }
 }
 
 void JogShuttle::customEvent(QEvent* e)