len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-10-10 08:03:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FixRed] Tree Hotkey on devices without HAVE_HOTKEY

Browse source 
Change-Id: I36f2fd8fc5edb2ac019a176cb9d3a3d014f1970d
This commit is contained in:
William Wilgus 2026-05-25 15:04:22 -04:00
parent 21e9d3f449
commit e471fe4115
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/onplay.c
View file

@ -1617,9 +1617,10 @@ int hotkey_run_menu(intptr_t flag, bool execute, int current_action)
struct hk_menu_data data = {hk_menu, execute ? 1 : 0}; struct hk_menu_data data = {hk_menu, execute ? 1 : 0};
char *title = str(LANG_ONPLAY_MENU_TITLE); char *title = str(LANG_ONPLAY_MENU_TITLE);
#ifdef HAVE_HOTKEY
if (flag & HOTKEY_FLAG_TREE) if (flag & HOTKEY_FLAG_TREE)
title = str(LANG_HOTKEY_FILE_BROWSER); title = str(LANG_HOTKEY_FILE_BROWSER);
#endif
struct simplelist_info info; struct simplelist_info info;
int selected = 0; int selected = 0;
int count = 0; int count = 0;
@ -1798,12 +1799,14 @@ static int hotkey_menu_do_setting(void *param, int *setting, int flag)
int wps_context_menu_do_setting(void *param) int wps_context_menu_do_setting(void *param)
{ {
return hotkey_menu_do_setting(param, &global_settings.context_wps, HOTKEY_FLAG_WPS); return hotkey_menu_do_setting(param, &global_settings.context_wps, HOTKEY_FLAG_WPS);
}
}
#ifdef HAVE_HOTKEY
int tree_context_menu_do_setting(void *param) int tree_context_menu_do_setting(void *param)
{ {
return hotkey_menu_do_setting(param, &global_settings.hotkey_tree, HOTKEY_FLAG_TREE); return hotkey_menu_do_setting(param, &global_settings.hotkey_tree, HOTKEY_FLAG_TREE);
} }
#endif
void wps_context_menu_load_from_cfg(void* setting, char *value) void wps_context_menu_load_from_cfg(void* setting, char *value)
{ {
@ -1837,8 +1840,11 @@ char* wps_context_menu_write_to_cfg(void* setting, char*buf, int buf_len)
{ {
int var = *(int*)setting; int var = *(int*)setting;
int items = HK_CTX_ITEMS; int items = HK_CTX_ITEMS;
#ifdef HAVE_HOTKEY
if (setting == &global_settings.hotkey_tree) if (setting == &global_settings.hotkey_tree)
items = 1; items = 1;
#endif
unsigned int written; unsigned int written;
char *buffer = buf; char *buffer = buf;

2
apps/onplay.h
View file

@ -95,7 +95,9 @@ void onplay_show_playlist_cat_menu(const char* track_name, int attr,
void onplay_show_playlist_menu(const char* path, int attr, void (*playlist_insert_cb)); void onplay_show_playlist_menu(const char* path, int attr, void (*playlist_insert_cb));
int wps_context_menu_do_setting(void *param); int wps_context_menu_do_setting(void *param);
#ifdef HAVE_HOTKEY
int tree_context_menu_do_setting(void *param); int tree_context_menu_do_setting(void *param);
#endif
void wps_context_menu_set_default(void* setting, void* defaultval); void wps_context_menu_set_default(void* setting, void* defaultval);
char* wps_context_menu_write_to_cfg(void* setting, char*buf, int buf_len); char* wps_context_menu_write_to_cfg(void* setting, char*buf, int buf_len);
void wps_context_menu_load_from_cfg(void* setting, char *value); void wps_context_menu_load_from_cfg(void* setting, char *value);