summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Rogalsky <ed.rogalsky@googlemail.com>2014-03-08 15:39:55 (GMT)
committerEd Rogalsky <ed.rogalsky@googlemail.com>2014-03-08 15:39:55 (GMT)
commitb165d7e4ed3625ca16d4e3c22a27aaad712af129 (patch)
tree50c1fdb162ea47203a7b60e65a601b4a7b6bdeec
parentb2f37cecd90d42af8cc8f655462c91cf6624cb01 (diff)
jogshuttle: shutup warnings in mediactrl
-rw-r--r--src/lib/external/media_ctrl/mediactrl.c6
-rw-r--r--src/lib/external/media_ctrl/mediactrl.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/external/media_ctrl/mediactrl.c b/src/lib/external/media_ctrl/mediactrl.c
index 7e05e80..0421b9a 100644
--- 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
@@ -291,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 }
};
diff --git a/src/lib/external/media_ctrl/mediactrl.h b/src/lib/external/media_ctrl/mediactrl.h
index fb10b2b..335c6da 100644
--- a/src/lib/external/media_ctrl/mediactrl.h
+++ b/src/lib/external/media_ctrl/mediactrl.h
@@ -102,7 +102,7 @@ struct media_ctrl_key {
int key; // internal keycode - do not use
const char *name;
int code; // eventcode
- int action;
+// int action;
};
struct media_ctrl_event {