jogshuttle: use call by reference

[kdenlive] / src / jogshuttle.h

diff --git a/src/jogshuttle.h b/src/jogshuttle.h
index 29384599ca85f8f0b39ed27124f1d295f83007b3..b136639abf4727d37e9511fcf965dd61971b6c81 100644 (file)
--- a/src/jogshuttle.h
+++ b/src/jogshuttle.h
@@ -21,42 +21,59 @@
 #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;
 
-class ShuttleThread : public QThread {
+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;
+    int shuttlecounter;
     unsigned short jogvalue;
     bool isWorking();
-    bool stop_me;
+    volatile bool stop_me;
+    QString m_device;
 
 private:
-    QString m_device;
     bool m_isWorking;
+    void handle_event(const struct media_ctrl_event& ev);
+    void jog(const struct media_ctrl_event& ev);
+    void shuttle(const struct media_ctrl_event& ev);
+    void key(const struct media_ctrl_event& ev);
+
+#ifdef USE_DEPRECATED
     void handle_event(EV ev);
-    void jogshuttle(unsigned short code, unsigned int value);
     void jog(unsigned int value);
     void shuttle(int value);
     void key(unsigned short code, unsigned int value);
+#endif
 };
 
+typedef QMap<QString, QString> DeviceMap;
+typedef QMap<QString, QString>::iterator DeviceMapIter;
 
-class JogShuttle: public QObject {
-Q_OBJECT public:
-    JogShuttle(QString device, QObject * parent = 0);
+class JogShuttle: public QObject
+{
+    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 canonicalDevice(const QString& device);
+    static DeviceMap enumerateDevices(const QString& devPath);
+    static int keysCount(const QString& devPath);
 
 protected:
     virtual void customEvent(QEvent * e);
@@ -65,11 +82,9 @@ private:
     ShuttleThread m_shuttleProcess;
 
 signals:
-    void rewind1();
-    void forward1();
-    void rewind(double);
-    void forward(double);
-    void stop();
+    void jogBack();
+    void jogForward();
+    void shuttlePos(int);
     void button(int);
 };