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

List:       kde-commits
Subject:    [kdenlive/next] src/lib/external/media_ctrl: jogshuttle: shuttle_pro_v2 keys added
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:27:52
Message-ID: E1Wfb6e-0003AX-8j () scm ! kde ! org
[Download RAW message or body]

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

jogshuttle: shuttle_pro_v2 keys added

M  +29   -6    src/lib/external/media_ctrl/mediactrl.c

http://commits.kde.org/kdenlive/1e5fae17585c4ea3c58f40da6d65725c02fea2b0

diff --git a/src/lib/external/media_ctrl/mediactrl.c \
b/src/lib/external/media_ctrl/mediactrl.c index 0c70a70..5a1ec06 100644
--- a/src/lib/external/media_ctrl/mediactrl.c
+++ b/src/lib/external/media_ctrl/mediactrl.c
@@ -39,27 +39,50 @@ static char *_shuttle_name = (char*)"Shuttle";
 static char *_jog_name = (char*)"Jog";
 
 /*
-	ShuttlePro keys
+	ShuttlePro v2 keys
 */
-static struct  media_ctrl_key mc_shuttle_pro_keys[] = {
+static struct  media_ctrl_key mc_shuttle_pro_v2_keys[] = {
 	{ 0x100, "Button 1", MEDIA_CTRL_F1 },
 	{ 0x101, "Button 2", MEDIA_CTRL_F2 },
 	{ 0x102, "Button 3", MEDIA_CTRL_F3 },
 	{ 0x103, "Button 4", MEDIA_CTRL_F4 },
-	{ 0x104, "Button 5", MEDIA_CTRL_B4 },
+	{ 0x104, "Button 5", MEDIA_CTRL_B1 },
 	{ 0x105, "Button 6", MEDIA_CTRL_B2 },
-	{ 0x106, "Button 7", MEDIA_CTRL_B1 },
-	{ 0x107, "Button 8", MEDIA_CTRL_B3 },
+	{ 0x106, "Button 7", MEDIA_CTRL_B3 },
+	{ 0x107, "Button 8", MEDIA_CTRL_B4 },
 	{ 0x108, "Button 9", MEDIA_CTRL_B5 },
 	{ 0x109, "Button 10", MEDIA_CTRL_B6 },
 	{ 0x10a, "Button 11", MEDIA_CTRL_B7 },
 	{ 0x10b, "Button 12", MEDIA_CTRL_B8 },
 	{ 0x10c, "Button 13", MEDIA_CTRL_B9 },
+    { 0x10d, "Button 14", MEDIA_CTRL_B10 },
+    { 0x10e, "Button 15", MEDIA_CTRL_B11 },
 	{ 0, NULL, 0 }
 };
 
 
 /*
+    ShuttlePro keys
+*/
+static struct  media_ctrl_key mc_shuttle_pro_keys[] = {
+    { 0x100, "Button 1", MEDIA_CTRL_F1 },
+    { 0x101, "Button 2", MEDIA_CTRL_F2 },
+    { 0x102, "Button 3", MEDIA_CTRL_F3 },
+    { 0x103, "Button 4", MEDIA_CTRL_F4 },
+    { 0x104, "Button 5", MEDIA_CTRL_B4 },
+    { 0x105, "Button 6", MEDIA_CTRL_B2 },
+    { 0x106, "Button 7", MEDIA_CTRL_B1 },
+    { 0x107, "Button 8", MEDIA_CTRL_B3 },
+    { 0x108, "Button 9", MEDIA_CTRL_B5 },
+    { 0x109, "Button 10", MEDIA_CTRL_B6 },
+    { 0x10a, "Button 11", MEDIA_CTRL_B7 },
+    { 0x10b, "Button 12", MEDIA_CTRL_B8 },
+    { 0x10c, "Button 13", MEDIA_CTRL_B9 },
+    { 0, NULL, 0 }
+};
+
+
+/*
 	ShuttleXPress keys
 */
 static struct  media_ctrl_key mc_shuttle_xpress_keys[] = {
@@ -286,7 +309,7 @@ void translate_compliant(struct media_ctrl *ctrl, struct \
input_event *ev, struct  }
 
 struct media_ctrl_device supported_devices[] = {
-	{ 0x0b33, 0x0030, "Contour Design ShuttlePRO v2", mc_shuttle_pro_keys, \
translate_contour_hid_event }, +	{ 0x0b33, 0x0030, "Contour Design ShuttlePRO v2", \
mc_shuttle_pro_v2_keys, translate_contour_hid_event },  { 0x0b33, 0x0020, "Contour \
Design ShuttleXpress", mc_shuttle_xpress_keys, translate_contour_hid_event },  { \
0x0b33, 0x0010, "Contour Design ShuttlePro", mc_shuttle_pro_keys, \
translate_contour_hid_event },  { 0x0b33, 0x0011, "Contour Design ShuttlePro", \
mc_shuttle_pro_keys, translate_contour_hid_event }, /* Hercules OEM */


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