[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/next] src: jogshuttle: bind event type to mediactrlevent class namespace
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:27:51
Message-ID: E1Wfb6d-0003AX-Lb () scm ! kde ! org
[Download RAW message or body]

Git commit 87d5d5fe441bdb8aecbaba3afa5ed1eb72f3d292 by Vincent PINON, on behalf of Ed Rogalsky.
Committed on 19/03/2014 at 18:03.
Pushed by vpinon into branch 'next'.

jogshuttle: bind event type to mediactrlevent class namespace

M  +12   -12   src/jogshuttle.cpp
M  +4    -0    src/jogshuttle.h

http://commits.kde.org/kdenlive/87d5d5fe441bdb8aecbaba3afa5ed1eb72f3d292

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index 94d8ebe..7e5f9a3 100644
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -37,12 +37,12 @@
 #include <unistd.h>
 
 
-namespace MediaCtrl
-{
-    const QEvent::Type KeyEvent = (QEvent::Type)QEvent::registerEventType();
-    const QEvent::Type JogEvent = (QEvent::Type)QEvent::registerEventType();
-    const QEvent::Type ShuttleEvent = (QEvent::Type)QEvent::registerEventType();
-}
+// init media event type constants
+const QEvent::Type MediaCtrlEvent::Key = (QEvent::Type)QEvent::registerEventType();
+const QEvent::Type MediaCtrlEvent::Jog = (QEvent::Type)QEvent::registerEventType();
+const QEvent::Type MediaCtrlEvent::Shuttle = (QEvent::Type)QEvent::registerEventType();
+
+
 
 void ShuttleThread::init(QObject *parent, const QString &device)
 {
@@ -138,7 +138,7 @@ void ShuttleThread::key(const media_ctrl_event& ev)
 {
     if (ev.value == KEY_PRESS) {
         QApplication::postEvent(m_parent,
-            new MediaCtrlEvent(MediaCtrl::KeyEvent, ev.index + 1));
+            new MediaCtrlEvent(MediaCtrlEvent::Key, ev.index + 1));
     }
 }
 
@@ -152,13 +152,13 @@ void ShuttleThread::shuttle(const media_ctrl_event& ev)
     }
 
     QApplication::postEvent(m_parent,
-        new MediaCtrlEvent(MediaCtrl::ShuttleEvent, value));
+        new MediaCtrlEvent(MediaCtrlEvent::Shuttle, value));
 }
 
 void ShuttleThread::jog(const media_ctrl_event& ev)
 {
     QApplication::postEvent(m_parent,
-        new MediaCtrlEvent(MediaCtrl::JogEvent, ev.value));
+        new MediaCtrlEvent(MediaCtrlEvent::Jog, ev.value));
 }
 
 JogShuttle::JogShuttle(const QString &device, QObject *parent) :
@@ -206,10 +206,10 @@ void JogShuttle::customEvent(QEvent* e)
 {
     QEvent::Type type = e->type();
 
-    if (type == MediaCtrl::KeyEvent) {
+    if (type == MediaCtrlEvent::Key) {
         MediaCtrlEvent* mev = (MediaCtrlEvent*)e;
         emit button(mev->value());
-    } else if (type == MediaCtrl::JogEvent) {
+    } else if (type == MediaCtrlEvent::Jog) {
         MediaCtrlEvent* mev = (MediaCtrlEvent*)e;
         int value = mev->value();
 
@@ -218,7 +218,7 @@ void JogShuttle::customEvent(QEvent* e)
         } else if (value > 0) {
             emit jogForward();
         }
-    } else if (type == MediaCtrl::ShuttleEvent) {
+    } else if (type == MediaCtrlEvent::Shuttle) {
         MediaCtrlEvent* mev = (MediaCtrlEvent*)e;
         emit shuttlePos(mev->value());
     }
diff --git a/src/jogshuttle.h b/src/jogshuttle.h
index 41c6e7f..7b05d4a 100644
--- a/src/jogshuttle.h
+++ b/src/jogshuttle.h
@@ -39,6 +39,10 @@ public:
 
     int value() { return m_value; }
 
+    static const QEvent::Type Key;
+    static const QEvent::Type Jog;
+    static const QEvent::Type Shuttle;
+
 private:
     int m_value;
 };

[prev in list] [next in list] [prev in thread] [next in thread]