Multitouch refactor

src/helper/functions.h

@@ -2,6 +2,7 @@
 #define SRC_HELPER_FUNCTIONS
 
 #include <iostream>
+#include <cstring>
 #include <SDL2/SDL.h>
 
 #if defined(__linux__) || defined(__APPLE__)

src/helper/protocol_const.h

@@ -38,6 +38,8 @@
 
 #define BTN_SIRI 5
 #define BTN_MICROPHONE 7
+#define BTN_12 12
+// Navigation buttons
 #define BTN_LEFT 100
 #define BTN_RIGHT 101
 #define BTN_SELECT_DOWN 104
@@ -45,10 +47,15 @@
 #define BTN_BACK 106
 #define BTN_DOWN 114
 #define BTN_HOME 200
+// Play control buttons
 #define BTN_PLAY 201
 #define BTN_PAUSE 202
+#define BTN_203 203 // pause/resume??
 #define BTN_NEXT_TRACK 204
 #define BTN_PREVIOUS_TRACK 205
+// Unknown buttons, volume????
+#define BTN_300 300
+#define BTN_301 301
 
 
 #define AUDIO_BUFFER_SIZE 2560

src/main.cpp

@@ -60,7 +60,9 @@ void processKey(Protocol &protocol, SDL_Keysym key, RunParams &params)
 
     case SDLK_r:
         params.dirty = true;
+        protocol.sendKey(BTN_12);
         return;
+
     case SDLK_h:
         protocol.sendKey(BTN_HOME);
         return;

src/protocol.cpp

@@ -153,26 +153,26 @@ void Protocol::sendClick(float x, float y, bool down)
     send(CMD_TOUCH, false, buf, 16);
 }
 
-
-void Protocol::sendMultiTouch(const std::vector<Protocol::Touch>& touches)
+void Protocol::sendMultiTouch(const Multitouch &touches)
 {
-    if (touches.empty()) return;
+    int count = touches.size();
+    if (count == 0)
+        return;
 
-    const size_t touchSize = 16;
-    const size_t totalSize = touches.size() * touchSize;
+    uint8_t buf[MUTLITOUCH_MAX_TOUCH * sizeof(Multitouch::Touch)];
+    uint8_t *p = buf;
 
-    std::vector<uint8_t> buf(totalSize);
-    uint8_t* p = buf.data();
-
-    for (const auto& t : touches) {
-        write_float_le(p + 0,  t.x);
-        write_float_le(p + 4,  t.y);
-        write_uint32_le(p + 8,  static_cast<uint32_t>(t.action));
-        write_uint32_le(p + 12, t.id);
-        p += touchSize;
+    for (int i = 0; i < count; ++i)
+    {
+        const Multitouch::Touch &t = touches[i];
+        write_float_le(p + 0, t.x);
+        write_float_le(p + 4, t.y);
+        write_uint32_le(p + 8, static_cast<uint32_t>(t.state));
+        write_uint32_le(p + 12, static_cast<uint32_t>(t.id));
+        p += 16;
     }
 
-    send(CMD_MULTI_TOUCH, false, buf.data(), totalSize);
+    send(CMD_MULTI_TOUCH, false, buf, 16 * count);
 }
 
 void Protocol::sendMove(float dx, float dy)

src/protocol.h

@@ -3,6 +3,7 @@
 
 #include "struct/atomic_queue.h"
 #include "struct/message.h"
+#include "struct/multitouch.h"
 #include "helper/iaudio_sender.h"
 #include "settings.h"
 #include "connector.h"
@@ -18,20 +19,6 @@ public:
     Protocol(const Protocol &) = delete;
     Protocol &operator=(const Protocol &) = delete;
 
-    enum Action {
-        UP = 16,
-        DOWN = 14,
-        MOVE = 15
-    };
-
-    struct Touch {
-        float x;
-        float y;
-        Action action;
-        uint32_t id;
-    };
-
-
     void start(uint32_t evtStatus, uint32_t evtPhone);
     void stop();
 
@@ -40,7 +27,7 @@ public:
     void sendFile(const char *filename, const char *value);
     void sendFile(const char *filename, int value);
     void sendClick(float x, float y, bool down);
-    void sendMultiTouch(const std::vector<Touch>& touches);
+    void sendMultiTouch(const Multitouch &touches);
     void sendMove(float dx, float dy);
     void sendAudio(uint8_t *data, uint32_t length) override;
 

src/struct/multitouch.h

@@ -0,0 +1,41 @@
+#ifndef SRC_STRUCT_MULTITOUCH
+#define SRC_STRUCT_MULTITOUCH
+
+#define MUTLITOUCH_MAX_TOUCH 5
+
+class Multitouch
+{
+public:
+    struct Touch
+    {
+        float x; 
+        float y;  
+        int state; 
+        int id;    
+    };
+
+    Multitouch() : _count(0) {}
+
+    bool add(float x, float y, int state, int id)
+    {
+        if (_count >= MUTLITOUCH_MAX_TOUCH)
+            return false;
+
+        _touches[_count++] = { x, y, state, id };
+        return true;
+    }
+
+    int size() const {
+        return _count;
+    }
+
+    const Touch& operator[](int index) const {
+        return _touches[index];
+    }
+
+private:
+    Touch _touches[MUTLITOUCH_MAX_TOUCH];
+    int _count;
+};
+
+#endif /* SRC_STRUCT_MULTITOUCH */