From b165d7e4ed3625ca16d4e3c22a27aaad712af129 Mon Sep 17 00:00:00 2001 From: Ed Rogalsky Date: Sat, 8 Mar 2014 16:39:55 +0100 Subject: [PATCH] jogshuttle: shutup warnings in mediactrl --- src/lib/external/media_ctrl/mediactrl.c | 6 +++--- src/lib/external/media_ctrl/mediactrl.h | 2 +- 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 7e05e807..0421b9a2 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 fb10b2ba..335c6dae 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 { -- 2.39.2