From 5e6840a9a540eb6e95271d3d6261b60bd363048d Mon Sep 17 00:00:00 2001 From: Toad King Date: Sat, 4 Jul 2015 17:11:24 -0500 Subject: [PATCH 1/3] add cooldown on ok/back buttons in menu, fixes weird wii bug with load core menu --- menu/menu_input.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/menu/menu_input.c b/menu/menu_input.c index 9f94adfb16..7a9d9e1456 100644 --- a/menu/menu_input.c +++ b/menu/menu_input.c @@ -970,6 +970,7 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) unsigned ret = 0; static bool initial_held = true; static bool first_held = false; + static int cooldown = 0; static const retro_input_t input_repeat = (1UL << RETRO_DEVICE_ID_JOYPAD_UP) | (1UL << RETRO_DEVICE_ID_JOYPAD_DOWN) @@ -1041,10 +1042,16 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) ret = MENU_ACTION_SCROLL_UP; else if (trigger_input & (1ULL << settings->menu_scroll_down_btn)) ret = MENU_ACTION_SCROLL_DOWN; - else if (trigger_input & (1ULL << settings->menu_cancel_btn)) + else if (trigger_input & (1ULL << settings->menu_cancel_btn) && !cooldown) + { ret = MENU_ACTION_CANCEL; - else if (trigger_input & (1ULL << settings->menu_ok_btn)) + cooldown = 20; + } + else if (trigger_input & (1ULL << settings->menu_ok_btn) && !cooldown) + { ret = MENU_ACTION_OK; + cooldown = 20; + } else if (trigger_input & (1ULL << settings->menu_search_btn)) ret = MENU_ACTION_SEARCH; else if (trigger_input & (1ULL << RETRO_DEVICE_ID_JOYPAD_Y)) @@ -1064,6 +1071,9 @@ unsigned menu_input_frame(retro_input_t input, retro_input_t trigger_input) if (settings->menu.pointer.enable) menu_input_pointer(&ret); + if (cooldown > 0) + cooldown--; + if (trigger_input && menu_ctx_driver_get_ptr()->perform_action && menu_ctx_driver_get_ptr()->perform_action(menu->userdata, ret)) From 6405c9b3ed2f685f69b010963bae425a33eac602 Mon Sep 17 00:00:00 2001 From: Toad King Date: Sat, 4 Jul 2015 17:59:35 -0500 Subject: [PATCH 2/3] android tv additions --- android/phoenix/AndroidManifest.xml | 7 +++++-- android/phoenix/res/drawable-xhdpi/banner.png | Bin 0 -> 6176 bytes 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 android/phoenix/res/drawable-xhdpi/banner.png diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml index b528d90cab..96de4238e9 100644 --- a/android/phoenix/AndroidManifest.xml +++ b/android/phoenix/AndroidManifest.xml @@ -4,6 +4,8 @@ android:versionName="1.2" android:installLocation="preferExternal"> + + @@ -13,12 +15,13 @@ - + + android:hasCode="true" + android:banner="@drawable/banner"> diff --git a/android/phoenix/res/drawable-xhdpi/banner.png b/android/phoenix/res/drawable-xhdpi/banner.png new file mode 100644 index 0000000000000000000000000000000000000000..c9ce27e49325beaeb205c9dd3831b1eab9817d0f GIT binary patch literal 6176 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 ckv Date: Sat, 4 Jul 2015 18:06:11 -0500 Subject: [PATCH 3/3] [Android] SDK bump needed for android tv banner --- android/phoenix/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml index 96de4238e9..6fd6fe4c2a 100644 --- a/android/phoenix/AndroidManifest.xml +++ b/android/phoenix/AndroidManifest.xml @@ -8,7 +8,7 @@ + android:targetSdkVersion="22" />