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

diff --cc src/jogshuttle.cpp
Simple merge

diff --cc src/jogshuttle.h
index f2523cc93c56ec6e20a38092ac050258541a8aa7,34673fa65348c697c1b622ae749606273a1c8f64..9a6ecc0287c5dbb01483b724f49c492e6dc411c7
--- 1/src/jogshuttle.h
--- 2/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:

diff --cc src/kdenlivesettingsdialog.cpp
Simple merge

diff --cc src/mainwindow.cpp
Simple merge