X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fjogshuttle.cpp;h=44517d7745a839db137310c716bb256b90d3c618;hb=937f547e26859d0ef9ddc0ac38d6986ab591b3fd;hp=362886362f2cd4a25e2fe9fe29aa5256cdaa70f6;hpb=8391434d0cdba5bc4c00afea00eb426d1f8a3e22;p=kdenlive

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index 36288636..44517d77 100644
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -26,6 +26,7 @@
 
 #include <QApplication>
 #include <QEvent>
+#include <QDir>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -68,7 +69,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;
@@ -87,6 +88,7 @@ bool ShuttleThread::isWorking()
 void ShuttleThread::run()
 {
 	kDebug() << "-------  STARTING SHUTTLE: " << m_device;
+
 	/* open file descriptor */
 	const int fd = KDE_open((char *) m_device.toUtf8().data(), O_RDONLY);
 	if (fd < 0) {
@@ -94,7 +96,7 @@ void ShuttleThread::run()
 		return;
 	}
 
-	EV ev;
+	EV ev[64];
 
 	if (ioctl(fd, EVIOCGRAB, 1) < 0) {
 		fprintf(stderr, "Can't get exclusive access on  Jog Shuttle FILE DESCRIPTOR\n");
@@ -105,9 +107,24 @@ void ShuttleThread::run()
 	fd_set		   readset;
 	struct timeval timeout;
 
-	int num_warnings = 0;
+	int num_warnings = 0, readResult = 0;
 	int result, iof = -1;
 
+	/* get fd settings */
+    if ((iof = fcntl(fd, F_GETFL, 0)) == -1) {
+        fprintf(stderr, "Can't get Jog Shuttle file status\n");
+        close(fd);
+        return;
+    }
+
+#if 0
+    else if (fcntl(fd, F_SETFL, iof | O_NONBLOCK) == -1) {
+        fprintf(stderr, "Can't set Jog Shuttle FILE DESCRIPTOR to O_NONBLOCK and stop thread\n");
+        close(fd);
+        return;
+    }
+#endif
+
 	/* enter thread loop */
 	while (!stop_me) {
 		/* reset the read set */
@@ -122,52 +139,57 @@ void ShuttleThread::run()
 		result = select(fd+1, &readset, NULL, NULL, &timeout);
 
 		/* see if there was an error or timeout else process event */
-		if (result < 0) {
-			/* usually this is a condition for exit but EINTR error is sometimes
-			 * thrown under special circumstances. I think its ok to ignore this
-			 * if its not too often */
+		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)) {
-				/* 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) {
-							/* 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++;
+				/* read input */
+				readResult = read(fd, ev, sizeof(EV) * 64);
+				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;
 					}
-					/* process event */
-					handle_event(ev);
-				} else {
-					fprintf(stderr, "Can't set Jog Shuttle FILE DESCRIPTOR to O_NONBLOCK and stop thread\n");
+					num_warnings++;
+				} else if (readResult < (int)sizeof(EV)) {
+					fprintf(stderr, "readResult < (int)sizeof(EV)\n");
+					/* stop thread */
+					stop_me = true;
+				} else if (readResult % (int)sizeof(EV) != 0) {
+					fprintf(stderr, "readResult mod (int)sizeof(EV) != 0\n");
+					/* stop thread */
 					stop_me = true;
+				} else {
+					for (int i = 0; i < readResult / (int)sizeof(EV); i++) {
+						/* process event */
+						handle_event(ev[i]);
+					}
 				}
 			}
 		}
 	}
 
+    kDebug() << "-------  STOPPING SHUTTLE: ";
 	/* close the handle and return thread */
 	close(fd);
 }
@@ -259,7 +281,7 @@ void ShuttleThread::jog(unsigned int value)
 }
 
 
-JogShuttle::JogShuttle(QString device, QObject *parent) :
+JogShuttle::JogShuttle(const QString &device, QObject *parent) :
         QObject(parent)
 {
     initDevice(device);
@@ -270,7 +292,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;
@@ -322,7 +344,15 @@ void JogShuttle::customEvent(QEvent* e)
     emit button(e->type() - KEY_EVENT_OFFSET);
 }
 
+QString JogShuttle::enumerateDevice(const QString &device)
+{
+    QDir canonDir(device);
+    //return QDir::canonicalPath(device);
+    return canonDir.canonicalPath();
+}
 
 
 // #include "jogshuttle.moc"
 
+
+#include "jogshuttle.moc"