X-Git-Url: https://git.sesse.net/?p=kdenlive;a=blobdiff_plain;f=src%2Flib%2Fexternal%2Fmedia_ctrl%2Fmediactrl.c;h=3558d825008503efe976ebcfc4a023bf267e6a8b;hp=4ca6527b8f5dcd4289d4d2f7c204038e7c6dca56;hb=4b84e98f0c659f04b6e798f9d83e607adf6f6bd2;hpb=8fd72a344483e436b396a1c288221a6e2f311dde diff --git a/src/lib/external/media_ctrl/mediactrl.c b/src/lib/external/media_ctrl/mediactrl.c index 4ca6527b..3558d825 100644 --- a/src/lib/external/media_ctrl/mediactrl.c +++ b/src/lib/external/media_ctrl/mediactrl.c @@ -282,7 +282,7 @@ void translate_compliant(struct media_ctrl *ctrl, struct input_event *ev, struct struct media_ctrl_device supported_devices[] = { { 0x0b33, 0x0030, "Contour ShuttlePRO v2", mc_shuttle_pro_keys, translate_contour_hid_event }, - { 0x0b33, 0x0020, "Contour ShuttleXPress", mc_shuttle_xpress_keys, translate_contour_hid_event }, + { 0x0b33, 0x0020, "Contour Design ShuttleXpress", mc_shuttle_xpress_keys, translate_contour_hid_event }, { 0x0b33, 0x0010, "Contour ShuttlePro", mc_shuttle_pro_keys, translate_contour_hid_event }, { 0x0b33, 0x0011, "Contour ShuttlePro", mc_shuttle_pro_keys, translate_contour_hid_event }, /* Hercules OEM */ { 0x05f3, 0x0240, "Contour ShuttlePro", mc_shuttle_pro_keys, translate_contour_hid_event }, @@ -430,6 +430,7 @@ void media_ctrl_open2(struct media_ctrl *mc, const char *devname) fd = open( devname, O_RDONLY ); if ( fd < 0 ) { perror(devname); + mc->fd = -1; } else { mc->fd = fd; //mc->eventno = i;