Просмотр исходного кода

Hold to exit for media and movie views

Roman Belyakovsky 2 лет назад
Родитель
Сommit
483d381987
3 измененных файлов с 20 добавлено и 11 удалено
  1. 1 1
      base_pack/hid_app/hid.h
  2. 8 5
      base_pack/hid_app/views/hid_media.c
  3. 11 5
      base_pack/hid_app/views/hid_movie.c

+ 1 - 1
base_pack/hid_app/hid.h

@@ -22,8 +22,8 @@
 #include "views/hid_media.h"
 #include "views/hid_media.h"
 #include "views/hid_movie.h"
 #include "views/hid_movie.h"
 #include "views/hid_mouse.h"
 #include "views/hid_mouse.h"
-#include "views/hid_mouse_jiggler.h"
 #include "views/hid_mouse_clicker.h"
 #include "views/hid_mouse_clicker.h"
+#include "views/hid_mouse_jiggler.h"
 #include "views/hid_tikshorts.h"
 #include "views/hid_tikshorts.h"
 #include "views/hid_ptt.h"
 #include "views/hid_ptt.h"
 
 

+ 8 - 5
base_pack/hid_app/views/hid_media.c

@@ -188,12 +188,15 @@ static bool hid_media_input_callback(InputEvent* event, void* context) {
     HidMedia* hid_media = context;
     HidMedia* hid_media = context;
     bool consumed = false;
     bool consumed = false;
 
 
-    if(event->type == InputTypePress) {
-        hid_media_process_press(hid_media, event);
-        consumed = true;
-    } else if(event->type == InputTypeRelease) {
-        hid_media_process_release(hid_media, event);
+    if(event->type == InputTypeLong && event->key == InputKeyBack) {
+        hid_hal_keyboard_release_all(hid_media->hid);
+    } else {
         consumed = true;
         consumed = true;
+        if(event->type == InputTypePress) {
+            hid_media_process_press(hid_media, event);
+        } else if(event->type == InputTypeRelease) {
+            hid_media_process_release(hid_media, event);
+        }
     }
     }
     return consumed;
     return consumed;
 }
 }

+ 11 - 5
base_pack/hid_app/views/hid_movie.c

@@ -186,13 +186,19 @@ static bool hid_movie_input_callback(InputEvent* event, void* context) {
     HidMovie* hid_movie = context;
     HidMovie* hid_movie = context;
     bool consumed = false;
     bool consumed = false;
 
 
-    if(event->type == InputTypePress) {
-        hid_movie_process_press(hid_movie, event);
-        consumed = true;
-    } else if(event->type == InputTypeRelease) {
-        hid_movie_process_release(hid_movie, event);
+    if(event->type == InputTypeLong && event->key == InputKeyBack) {
+        hid_hal_keyboard_release_all(hid_movie->hid);
+    } else {
         consumed = true;
         consumed = true;
+        if(event->type == InputTypePress) {
+            hid_movie_process_press(hid_movie, event);
+            consumed = true;
+        } else if(event->type == InputTypeRelease) {
+            hid_movie_process_release(hid_movie, event);
+            consumed = true;
+        }
     }
     }
+
     return consumed;
     return consumed;
 }
 }