From: Ed Rogalsky <ed.rogalsky@googlemail.com>
Date: Tue, 20 Nov 2012 09:40:20 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into bugfix/jogshuttle
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2b4a438e09bf373960bcd127dcf6701a74b3ee22;p=kdenlive

Merge remote-tracking branch 'origin/master' into bugfix/jogshuttle
---

2b4a438e09bf373960bcd127dcf6701a74b3ee22
diff --cc src/jogshuttle.h
index f2523cc9,34673fa6..9a6ecc02
--- a/src/jogshuttle.h
+++ b/src/jogshuttle.h
@@@ -37,10 -37,10 +37,10 @@@ public
      void init(QObject *parent, 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: