Merge pull request #31 from parkerlreed/development

Added media keys (Previous, Next, Play/Pause) to the handling
f1xpl · Mar 6, 2018 · f46ab5b · f46ab5b
2 parents 5e57bcc + 1af06da
commit f46ab5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/autoapp/Projection/InputDevice.cpp b/src/autoapp/Projection/InputDevice.cpp
@@ -133,14 +133,17 @@ bool InputDevice::handleKeyEvent(QEvent* event, QKeyEvent* key)
         buttonCode = aasdk::proto::enums::ButtonCode::PAUSE;
         break;
 
+    case Qt::Key_MediaPrevious:
     case Qt::Key_V:
         buttonCode = aasdk::proto::enums::ButtonCode::PREV;
         break;
 
+    case Qt::Key_MediaPlay:
     case Qt::Key_B:
         buttonCode = aasdk::proto::enums::ButtonCode::TOGGLE_PLAY;
         break;
 
+    case Qt::Key_MediaNext:
     case Qt::Key_N:
         buttonCode = aasdk::proto::enums::ButtonCode::NEXT;
         break;

diff --git a/src/autoapp/UI/SettingsWindow.cpp b/src/autoapp/UI/SettingsWindow.cpp
@@ -226,9 +226,9 @@ void SettingsWindow::onShowBindings()
                             + QString("Call end -> [O] \n")
                             + QString("Play -> [X] \n")
                             + QString("Pause -> [C] \n")
-                            + QString("Previous track -> [V] \n")
-                            + QString("Next track -> [N] \n")
-                            + QString("Toggle play -> [B] \n")
+                            + QString("Previous track -> [V]/[Media Previous] \n")
+                            + QString("Next track -> [N]/[Media Next] \n")
+                            + QString("Toggle play -> [B]/[Media Play] \n")
                             + QString("Voice command -> [M] \n")
                             + QString("Wheel left -> [1] \n")
                             + QString("Wheel right -> [2]");