jogshuttle: add support for shuttles on newer systems - part1

[kdenlive] / src / jogshuttle.cpp

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index ede869ea888c9c0c81211b437ecb6f47928a21c4..44517d7745a839db137310c716bb256b90d3c618 100644 (file)
--- 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");
@@ -109,13 +111,19 @@ void ShuttleThread::run()
        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;
-       }
+    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) {
@@ -146,7 +154,7 @@ void ShuttleThread::run()
                        /* we have input */
                        if (FD_ISSET(fd, &readset)) {
                                /* read input */
-                               readResult = read(fd, &ev, sizeof(ev));
+                               readResult = read(fd, ev, sizeof(EV) * 64);
                                if (readResult < 0) {
                                        if (num_warnings % 10000 == 0) {
                                                /* if device is not available anymore - dead or disconnected */
@@ -163,17 +171,25 @@ void ShuttleThread::run()
                                                stop_me = true;
                                        }
                                        num_warnings++;
-                               } else if (readResult == sizeof(ev)) {
-                                       /* process event */
-                                       handle_event(ev);
+                               } 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 {
-                                       fprintf(stderr, "Read nr of bytes != sizeof(ev)\n");
+                                       for (int i = 0; i < readResult / (int)sizeof(EV); i++) {
+                                               /* process event */
+                                               handle_event(ev[i]);
+                                       }
                                }
                        }
                }
        }
 
-//     kDebug() << "Close thread" << "\n";
+    kDebug() << "-------  STOPPING SHUTTLE: ";
        /* close the handle and return thread */
        close(fd);
 }
@@ -265,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);
@@ -276,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;
@@ -328,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"