jogshuttle: keys count function added to mediactrl

diff --git a/src/jogshuttle.cpp b/src/jogshuttle.cpp
index c846e9c96e4a10eada03cc6f80943d056bcc0b6d..4506985eda00bfae55daf7e87ffb0f99b83520e2 100644 (file)
--- a/src/jogshuttle.cpp
+++ b/src/jogshuttle.cpp
@@ -411,6 +411,8 @@ DeviceMap JogShuttle::enumerateDevices(const QString& devPath)
         media_ctrl_open2(&mc, (char*)fileLink.toUtf8().data());
         if (mc.fd > 0 && mc.device) {
             devs.insert(QString(mc.device->name), devFullPath);
+            kDebug() <<  QString(" [keys-count=%1] ").arg(
+                    media_ctrl_get_keys_count(&mc));
         }
         media_ctrl_close(&mc);
     }

diff --git a/src/lib/external/media_ctrl/mediactrl.c b/src/lib/external/media_ctrl/mediactrl.c
index 3558d825008503efe976ebcfc4a023bf267e6a8b..104b5acf0cf5364ef4995f92f9b50d4fbe93db36 100644 (file)
--- a/src/lib/external/media_ctrl/mediactrl.c
+++ b/src/lib/external/media_ctrl/mediactrl.c
@@ -171,6 +171,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) 
 {

diff --git a/src/lib/external/media_ctrl/mediactrl.h b/src/lib/external/media_ctrl/mediactrl.h
index 652b4ffe1b445fd3dc53a0b629c1639b76faa1a7..fb10b2ba0fc2505ce273125627cd64e08bfa5d94 100644 (file)
--- a/src/lib/external/media_ctrl/mediactrl.h
+++ b/src/lib/external/media_ctrl/mediactrl.h
@@ -148,6 +148,7 @@ void media_ctrl_close(struct media_ctrl *);
 void media_ctrl_read_event(struct media_ctrl *, struct media_ctrl_event *);
 
 struct  media_ctrl_key *media_ctrl_get_keys(struct media_ctrl *);
+int media_ctrl_get_keys_count(struct media_ctrl *);
 
 #ifdef __cplusplus
 }