minor code style fixes

[kdenlive] / src / jogshuttle.h

diff --git a/src/jogshuttle.h b/src/jogshuttle.h
index 2c28d88fc1238e1d6e9b78d1610a9a7002410153..36e1f4c8df435725f66149b98a5ea2d1a7ee3940 100644 (file)
--- a/src/jogshuttle.h
+++ b/src/jogshuttle.h
@@ -21,11 +21,13 @@
 #ifndef SHUTTLE_H
 #define SHUTTLE_H
 
-#include <qthread.h>
+#include <QThread>
 #include <QObject>
+#include <QMap>
 
 #include <linux/input.h>
-
+#include <sys/time.h>
+#include <media_ctrl/mediactrl.h>
 
 typedef struct input_event EV;
 
@@ -34,31 +36,41 @@ class ShuttleThread : public QThread
 
 public:
     virtual void run();
-    void init(QObject *parent, QString device);
+    void init(QObject *parent, const QString &device);
     QObject *m_parent;
     int shuttlevalue;
-    bool shuttlechange;
+    int shuttlecounter;
     unsigned short jogvalue;
     bool isWorking();
-    bool stop_me;
+    volatile bool stop_me;
     QString m_device;
 
 private:
     bool m_isWorking;
     void handle_event(EV ev);
+    void handle_event(struct media_ctrl_event ev);
+    void jog(struct media_ctrl_event ev);
     void jog(unsigned int value);
     void shuttle(int value);
+    void shuttle(struct media_ctrl_event ev);
     void key(unsigned short code, unsigned int value);
+    void key(struct media_ctrl_event ev);
 };
 
+typedef QMap<QString, QString> DeviceMap;
+typedef QMap<QString, QString>::iterator DeviceMapIter;
 
 class JogShuttle: public QObject
 {
-Q_OBJECT public:
-    explicit JogShuttle(QString device, QObject * parent = 0);
+    Q_OBJECT
+public:
+    explicit JogShuttle(const QString &device, QObject * parent = 0);
     ~JogShuttle();
     void stopDevice();
-    void initDevice(QString device);
+    void initDevice(const QString &device);
+    static QString enumerateDevice(const QString& device);
+    static DeviceMap enumerateDevices(const QString& devPath);
+    static int keysCount(const QString& devPath);
 
 protected:
     virtual void customEvent(QEvent * e);