X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fjogshuttle.cpp;h=36ea3cd0fb13dbfa193fe03471c1bdbe814e278c;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=f9049511dceefcc568ecf037e33c2fdec5b3ea0c;hpb=2b4a438e09bf373960bcd127dcf6701a74b3ee22;p=kdenlive

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index f9049511..36ea3cd0 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
@@ -66,7 +68,7 @@
 #define JOG_STOP 10020
 #define MAX_SHUTTLE_RANGE 7
 
-void ShuttleThread::init(QObject *parent, QString device)
+void ShuttleThread::init(QObject *parent, const QString &device)
 {
     m_parent = parent;
     m_device = device;
@@ -84,32 +86,96 @@ 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) {
+		perror("Can't open Jog Shuttle FILE DESCRIPTOR");
+		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, 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 */
+		FD_ZERO(&readset);
+		FD_SET(fd, &readset);
+
+		/* reinit the timeout structure */
+		timeout.tv_sec  = 0;
+		timeout.tv_usec = 400000; /* 400 ms */
+
+		/* 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 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) {
+			/* do nothing. reserved for future purposes */
+		} else {
+			/* we have input */
+			if (FD_ISSET(fd, &readset)) {
+				/* 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);
+					}
+					/* 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, "Read nr of bytes != sizeof(ev)\n");
+				}
+			}
+		}
+	}
+
+//	kDebug() << "Close thread" << "\n";
+	/* close the handle and return thread */
+	close(fd);
 }
 
 void ShuttleThread::handle_event(EV ev)
@@ -139,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)));
 
 }
@@ -199,7 +265,7 @@ void ShuttleThread::jog(unsigned int value)
 }
 
 
-JogShuttle::JogShuttle(QString device, QObject *parent) :
+JogShuttle::JogShuttle(const QString &device, QObject *parent) :
         QObject(parent)
 {
     initDevice(device);
@@ -210,7 +276,7 @@ JogShuttle::~JogShuttle()
 	stopDevice();
 }
 
-void JogShuttle::initDevice(QString device)
+void JogShuttle::initDevice(const QString &device)
 {
     if (m_shuttleProcess.isRunning()) {
         if (device == m_shuttleProcess.m_device) return;
@@ -223,11 +289,11 @@ void JogShuttle::initDevice(QString device)
 void JogShuttle::stopDevice()
 {
     if (m_shuttleProcess.isRunning()) {
-    	/* the read fd is in blocking mode => stop_me is broken at the moment */
+    	/* tell thread to stop */
         m_shuttleProcess.stop_me = true;
         m_shuttleProcess.exit();
-        /* give the thread some time to shutdown */
-        m_shuttleProcess.wait(100);
+        /* 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()) {
@@ -266,3 +332,5 @@ void JogShuttle::customEvent(QEvent* e)
 
 // #include "jogshuttle.moc"
 
+
+#include "jogshuttle.moc"