jogshuttle: shutup warnings in mediactrl

[kdenlive] / src / lib / external / media_ctrl / mediactrl.c

diff --git a/src/lib/external/media_ctrl/mediactrl.c b/src/lib/external/media_ctrl/mediactrl.c
index 3558d825008503efe976ebcfc4a023bf267e6a8b..0421b9a287de4f56ae98408d8728f1943f58f34c 100644 (file)
--- a/src/lib/external/media_ctrl/mediactrl.c
+++ b/src/lib/external/media_ctrl/mediactrl.c
@@ -33,8 +33,8 @@
 #include "mediactrl.h"
 
 
-static char *_shuttle_name = "Shuttle";
-static char *_jog_name = "Jog";
+static char *_shuttle_name = (char*)"Shuttle";
+static char *_jog_name = (char*)"Jog";
 
 /*
        ShuttlePro keys
@@ -60,15 +60,6 @@ static struct  media_ctrl_key mc_shuttle_pro_keys[] = {
 /*
        ShuttleXPress keys
 */
-static struct  media_ctrl_key _mc_shuttle_xpress_keys[] = {
-    { 0x104, "Button B4", MEDIA_CTRL_B4 },
-    { 0x105, "Button B2", MEDIA_CTRL_B2 },
-    { 0x106, "Button B1", MEDIA_CTRL_B1 },
-    { 0x107, "Button B3", MEDIA_CTRL_B3 },
-    { 0x108, "Button B5", MEDIA_CTRL_B5 },
-    { 0, NULL, 0 }
-};
-
 static struct  media_ctrl_key mc_shuttle_xpress_keys[] = {
     { 0x104, "Button B1", MEDIA_CTRL_B1},
     { 0x105, "Button B2", MEDIA_CTRL_B2 },
@@ -171,6 +162,17 @@ struct  media_ctrl_key *media_ctrl_get_key(struct media_ctrl *ctrl, int code, in
        return NULL;
 }
 
+int media_ctrl_get_keys_count(struct media_ctrl *ctrl)
+{
+    int i = 0;
+    struct media_ctrl_key *keys = ctrl->device->keys;
+
+    while ( keys[i].key != 0 ) {
+        i++;
+    }
+
+    return i;
+}
 
 void translate_contour_hid_event(struct media_ctrl *ctrl, struct input_event *ev, struct media_ctrl_event *me) 
 {
@@ -289,7 +291,7 @@ struct media_ctrl_device supported_devices[] = {
        { 0x0760, 0x0001, "JLCooper MCS3", mc_jlcooper_mcs3_keys, translate_compliant },
        { 0x077d, 0x0410, "Griffin PowerMate", mc_powermate_keys, translate_compliant },
        { 0x05f3, 0x0241, "X-Keys Editor", mc_x_keys, translate_contour_hid_event },
-       { 0, 0, 0 }
+       { 0, 0, 0, 0, 0 }
 };