X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fjogshuttle.cpp;h=6a61812e8b927d5cfad461961ef8ceb185b7d895;hb=5bcb9b7ead3d053cb2b0498d84a2622626bf7f14;hp=caba1eb5357cd9ecbf2dc9b856f17b1c81690464;hpb=c1ad9ec174e137d76b6bb92430d2798db27f07d7;p=kdenlive

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index caba1eb5..6a61812e 100644
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <string.h>
 #include <linux/input.h>
-#include <signal.h>
 
 #define DELAY 10
 
@@ -69,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;
@@ -85,11 +84,6 @@ bool ShuttleThread::isWorking()
     return m_isWorking;
 }
 
-void catcher(int sig)
-{
-   printf("   Signal catcher called for signal %d\n", sig);
-}
-
 void ShuttleThread::run()
 {
 	kDebug() << "-------  STARTING SHUTTLE: " << m_device;
@@ -111,17 +105,19 @@ void ShuttleThread::run()
 	fd_set		   readset;
 	struct timeval timeout;
 
-	int num_warnings, readResult = 0;
+	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;
-	}
+    if ((iof = fcntl(fd, F_GETFL, 0)) == -1) {
+        fprintf(stderr, "Can't get Jog Shuttle file status\n");
+        close(fd);
+        return;
+    } 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;
+    }
 
 	/* enter thread loop */
 	while (!stop_me) {
@@ -271,7 +267,7 @@ void ShuttleThread::jog(unsigned int value)
 }
 
 
-JogShuttle::JogShuttle(QString device, QObject *parent) :
+JogShuttle::JogShuttle(const QString &device, QObject *parent) :
         QObject(parent)
 {
     initDevice(device);
@@ -282,7 +278,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;
@@ -338,3 +334,5 @@ void JogShuttle::customEvent(QEvent* e)
 
 // #include "jogshuttle.moc"
 
+
+#include "jogshuttle.moc"