Index: apps/action.h =================================================================== --- apps/action.h (revision 25376) +++ apps/action.h (working copy) @@ -136,6 +136,7 @@ ACTION_WPS_ABSETA_PREVDIR, /* these should be safe to put together seen as */ ACTION_WPS_ABSETB_NEXTDIR, /* you shouldnt want to change dir in ab-mode */ ACTION_WPS_ABRESET, + ACTION_WPS_HOTKEY, /* list and tree page up/down */ ACTION_LISTTREE_PGUP,/* optional */ @@ -151,6 +152,7 @@ ACTION_TREE_PGRIGHT,/* optional */ ACTION_TREE_STOP, ACTION_TREE_WPS, + ACTION_TREE_HOTKEY, /* radio */ ACTION_FM_MENU, Index: apps/tree.c =================================================================== --- apps/tree.c (revision 25376) +++ apps/tree.c (working copy) @@ -757,12 +757,14 @@ #endif case ACTION_STD_CONTEXT: + case ACTION_TREE_HOTKEY: { + bool hotkey = button == ACTION_TREE_HOTKEY; int onplay_result; int attr = 0; if(!numentries) - onplay_result = onplay(NULL, 0, curr_context); + onplay_result = onplay(NULL, 0, curr_context, hotkey); else { #ifdef HAVE_TAGCACHE if (id3db) @@ -788,7 +790,7 @@ snprintf(buf, sizeof buf, "/%s", dircache[tc.selected_item].name); } - onplay_result = onplay(buf, attr, curr_context); + onplay_result = onplay(buf, attr, curr_context, hotkey); } switch (onplay_result) { Index: apps/lang/english.lang =================================================================== --- apps/lang/english.lang (revision 25376) +++ apps/lang/english.lang (working copy) @@ -13394,3 +13394,71 @@ lineout_poweroff: "Line Out" + + id: LANG_SET_HOTKEY + desc: hotkey splash + user: core + + *: none + hotkey: "Set Hotkey: %s" + + + *: none + hotkey: "Set Hotkey: %s" + + + *: none + hotkey: "Set Hotkey: %s" + + + + id: LANG_HOTKEY_NOT_SET + desc: hotkey splash + user: core + + *: none + hotkey: "Hotkey Not Set" + + + *: none + hotkey: "Hotkey Not Set" + + + *: none + hotkey: "Hotkey Not Set" + + + + id: LANG_HOTKEY + desc: hotkey menu + user: core + + *: none + hotkey: "Hotkey" + + + *: none + hotkey: "Hotkey" + + + *: none + hotkey: "Hotkey" + + + + id: LANG_VIEW_HOTKEY + desc: hotkey menu + user: core + + *: none + hotkey: "View Hotkey Settings" + + + *: none + hotkey: "View Hotkey Settings" + + + *: none + hotkey: "View Hotkey Settings" + + Index: apps/onplay.c =================================================================== --- apps/onplay.c (revision 25376) +++ apps/onplay.c (working copy) @@ -64,6 +64,7 @@ #include "statusbar-skinned.h" #include "pitchscreen.h" #include "viewport.h" +#include "hotkey.h" static int context; static char* selected_file = NULL; @@ -528,7 +529,7 @@ /* share code for file and directory deletion, saves space */ -static bool delete_handler(bool is_dir) +static bool delete_item(void) { char file_to_delete[MAX_PATH]; strcpy(file_to_delete, selected_file); @@ -551,7 +552,7 @@ splash(0, str(LANG_DELETING)); int res; - if (is_dir) + if (selected_file_attr & ATTR_DIRECTORY) /* true if directory */ { char pathname[MAX_PATH]; /* space to go deep */ cpu_boost(true); @@ -568,16 +569,6 @@ return (res == 0); } -static bool delete_file(void) -{ - return delete_handler(false); -} - -static bool delete_dir(void) -{ - return delete_handler(true); -} - static bool rename_file(void) { char newname[MAX_PATH]; @@ -988,9 +979,9 @@ MENUITEM_FUNCTION(clipboard_paste_item, 0, ID2P(LANG_PASTE), clipboard_paste, NULL, clipboard_callback, Icon_NOICON); MENUITEM_FUNCTION(delete_file_item, 0, ID2P(LANG_DELETE), - delete_file, NULL, clipboard_callback, Icon_NOICON); + delete_item, NULL, clipboard_callback, Icon_NOICON); MENUITEM_FUNCTION(delete_dir_item, 0, ID2P(LANG_DELETE_DIR), - delete_dir, NULL, clipboard_callback, Icon_NOICON); + delete_item, NULL, clipboard_callback, Icon_NOICON); MENUITEM_FUNCTION(create_dir_item, 0, ID2P(LANG_CREATE_DIR), create_dir, NULL, clipboard_callback, Icon_NOICON); @@ -1180,19 +1171,165 @@ } return action; } -int onplay(char* file, int attr, int from) + +#ifdef HOTKEY +extern const struct menu_item_ex *selected_menu_item; +extern bool hotkey_settable_menu; + +#define HOT_MASK 0x0FF +#define HOT_WPS 0x100 +#define HOT_TREE 0x200 + +struct hotkey_assignment { + int item; + struct menu_func func; + int return_code; + const struct menu_item_ex *menu_addr; +}; + +#define HOTKEY_FUNC(func, param) {{(void *)func}, param} + +/* Any desired hotkey functions go in this struct. + Also update the enum table in hotkey.h */ +static struct hotkey_assignment hotkey_items[] = { + { HOTKEY_VIEW_PLAYLIST | HOT_WPS, + HOTKEY_FUNC(NULL, NULL), + ONPLAY_PLAYLIST, &view_cur_playlist }, +#ifdef HAVE_PITCHSCREEN + { HOTKEY_PITCHSCREEN | HOT_WPS, + HOTKEY_FUNC(gui_syncpitchscreen_run, NULL), + ONPLAY_RELOAD_DIR, &pitch_screen_item }, +#endif + { HOTKEY_DELETE | HOT_WPS | HOT_TREE, + HOTKEY_FUNC(delete_item, NULL), + ONPLAY_RELOAD_DIR, &delete_file_item }, + { HOTKEY_DELETE | HOT_TREE, + HOTKEY_FUNC(delete_item, NULL), + ONPLAY_RELOAD_DIR, &delete_dir_item }, + { HOTKEY_INSERT | HOT_TREE, + HOTKEY_FUNC(playlist_insert_func, (intptr_t*)PLAYLIST_INSERT), + ONPLAY_START_PLAY, &i_pl_item }, +}; + +static const int num_hotkey_items = sizeof(hotkey_items) / sizeof(hotkey_items[0]); + +/* Execute the hotkey function, if listed for this screen */ +static int execute_hotkey(bool is_wps) { + int i; + struct hotkey_assignment *this_item; + const int context = is_wps ? HOT_WPS : HOT_TREE; + const int this_hotkey = (is_wps ? global_settings.hotkey_wps : + global_settings.hotkey_tree); + + /* search assignment struct for a match for the hotkey setting */ + for (i = 0; i < num_hotkey_items; i++) + { + this_item = &hotkey_items[i]; + if ((this_item->item & context) && + ((this_item->item & HOT_MASK) == this_hotkey)) + { + /* run the associated function (with optional param), if any */ + const struct menu_func func = this_item->func; + if (func.function != NULL) + { + if (func.param != NULL) + (*(func.function_w_param))(func.param); + else + (*(func.function))(); + } + /* return with the associated code */ + return this_item->return_code; + } + } + + /* no valid hotkey set */ + splash(HZ, ID2P(LANG_HOTKEY_NOT_SET)); + return ONPLAY_RELOAD_DIR; +} + +/* Set the hotkey to the current context menu function, if listed */ +static void set_hotkey(bool is_wps) +{ + int i; + struct hotkey_assignment *this_item; + const int context = is_wps ? HOT_WPS : HOT_TREE; + int *hk_func = is_wps ? &global_settings.hotkey_wps : + &global_settings.hotkey_tree, + *hk_desc = is_wps ? &global_settings.hotkey_wps_desc_id : + &global_settings.hotkey_tree_desc_id; + int this_hk, + this_id; + bool match_found = false; + + /* search assignment struct for a function that matches the current menu item */ + for (i = 0; i < num_hotkey_items; i++) + { + this_item = &hotkey_items[i]; + if ((this_item->item & context) && + (this_item->menu_addr == selected_menu_item)) + { + this_hk = this_item->item & HOT_MASK; + this_id = P2ID((selected_menu_item->callback_and_desc)->desc); + match_found = true; + break; + } + } + + /* ignore the hotkey if no match found or no change to setting */ + if (!match_found || (this_hk == *hk_func)) return; + + char line1_buf[100]; + char line2_buf[101]; + char *line1 = line1_buf; + char *line2 = line2_buf; + char **line1_ptr = &line1; + char **line2_ptr = &line2; + const struct text_message message={(const char **)line2_ptr, 1}; + const struct text_message yes_message={(const char **)line1_ptr, 1}; + + snprintf(line1, 100, str(LANG_SET_HOTKEY), str(this_id)); + strcat(strcpy(line2, line1), "?"); + + /* confirm the hotkey setting change */ + if(gui_syncyesno_run(&message, &yes_message, NULL)==YESNO_YES) + { + /* store the hotkey settings */ + *hk_func = this_hk; + *hk_desc = this_id; + + settings_save(); + splash(HZ*2, line1); + } +} +#endif /* HOTKEY */ + +int onplay(char* file, int attr, int from, bool hotkey) +{ const struct menu_item_ex *menu; onplay_result = ONPLAY_OK; context = from; selected_file = file; selected_file_attr = attr; +#ifdef HOTKEY + if (hotkey) + return execute_hotkey(context == CONTEXT_WPS); + hotkey_settable_menu = true; +#else + (void)hotkey; +#endif if (context == CONTEXT_WPS) menu = &wps_onplay_menu; else menu = &tree_onplay_menu; switch (do_menu(menu, NULL, NULL, false)) { +#ifdef HOTKEY + hotkey_settable_menu = false; + case MENU_SELECTED_HOTKEY: + set_hotkey(context == CONTEXT_WPS); + return ONPLAY_RELOAD_DIR; +#endif case GO_TO_WPS: return ONPLAY_START_PLAY; case GO_TO_ROOT: Index: apps/gui/wps.c =================================================================== --- apps/gui/wps.c (revision 25376) +++ apps/gui/wps.c (working copy) @@ -888,10 +888,12 @@ switch(button) { case ACTION_WPS_CONTEXT: + case ACTION_WPS_HOTKEY: { + bool hotkey = button == ACTION_WPS_HOTKEY; gwps_leave_wps(); int retval = onplay(wps_state.id3->path, - FILE_ATTR_AUDIO, CONTEXT_WPS); + FILE_ATTR_AUDIO, CONTEXT_WPS, hotkey); /* if music is stopped in the context menu we want to exit the wps */ if (retval == ONPLAY_MAINMENU || !audio_status()) @@ -1182,10 +1184,12 @@ case SYS_POWEROFF: default_event_handler(SYS_POWEROFF); break; +#ifndef HOTKEY case ACTION_WPS_VIEW_PLAYLIST: gwps_leave_wps(); return GO_TO_PLAYLIST_VIEWER; break; +#endif default: if(default_event_handler(button) == SYS_USB_CONNECTED) { Index: apps/menu.c =================================================================== --- apps/menu.c (revision 25376) +++ apps/menu.c (working copy) @@ -61,6 +61,12 @@ #include "list.h" #include "buttonbar.h" +/* hotkey settings */ +#ifdef HOTKEY +const struct menu_item_ex *selected_menu_item; +bool hotkey_settable_menu = false; +#endif + #define MAX_MENUS 8 /* used to allow for dynamic menus */ #define MAX_MENU_SUBITEMS 64 @@ -426,6 +432,17 @@ done = true; } #endif +#ifdef HOTKEY + else if (hotkey_settable_menu && + ((action == ACTION_WPS_HOTKEY) || + (action == ACTION_TREE_HOTKEY))) + { + ret = MENU_SELECTED_HOTKEY; + done = true; + selected = get_menu_selection(gui_synclist_get_sel_pos(&lists),menu); + selected_menu_item = menu->submenus[selected]; + } +#endif else if (action == ACTION_TREE_WPS) { ret = GO_TO_PREVIOUS_MUSIC; Index: apps/settings.h =================================================================== --- apps/settings.h (revision 25376) +++ apps/settings.h (working copy) @@ -816,6 +816,13 @@ bool morse_input; /* text input method setting */ #endif +#ifdef HOTKEY + int hotkey_wps; + int hotkey_wps_desc_id; + int hotkey_tree; + int hotkey_tree_desc_id; +#endif + }; /** global variables **/ Index: apps/menus/settings_menu.c =================================================================== --- apps/menus/settings_menu.c (revision 25376) +++ apps/menus/settings_menu.c (working copy) @@ -47,6 +47,10 @@ #ifdef HAVE_DIRCACHE #include "dircache.h" #endif +#ifdef HOTKEY +#include "list.h" +#include "settings_list.h" +#endif /***********************************/ /* TAGCACHE MENU */ @@ -400,6 +404,58 @@ /***********************************/ +/* HOTKEY MENU */ +#ifdef HOTKEY +static void view_hotkey_info(void) +{ + struct simplelist_info info; + simplelist_info_init(&info, str(LANG_VIEW_HOTKEY), 0, NULL); + info.hide_selection = true; + simplelist_set_line_count(2); + simplelist_addline(0, "WPS: %s", + str(global_settings.hotkey_wps_desc_id)); + simplelist_addline(1, "Tree: %s", + str(global_settings.hotkey_tree_desc_id)); + simplelist_show_list(&info); +} + +/* reset hotkey settings to their defaults */ +static void reset_hotkey_settings(void) +{ + void *vars[] = { + &global_settings.hotkey_tree, + &global_settings.hotkey_tree_desc_id, + &global_settings.hotkey_wps, + &global_settings.hotkey_wps_desc_id, + }; + const int num_settings = sizeof(vars) / sizeof(vars[0]); + int i; + + for (i = 0; i < num_settings; i++) + { + const struct settings_list *setting = + find_setting(vars[i], NULL); + reset_setting(setting, setting->setting); + } + + settings_save(); + splash(HZ, str(LANG_RESET_DONE_CLEAR)); +} + +MENUITEM_FUNCTION(hotkey_view, 0, ID2P(LANG_VIEW_HOTKEY), + (int(*)(void))view_hotkey_info, NULL, + NULL, Icon_NOICON); +MENUITEM_FUNCTION(hotkey_reset, 0, ID2P(LANG_RESET), + (int(*)(void))reset_hotkey_settings, NULL, + NULL, Icon_NOICON); +MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON, + &hotkey_view, &hotkey_reset); +#endif /*hotkey */ +/* HOTKEY MENU */ +/***********************************/ + + +/***********************************/ /* SETTINGS MENU */ static int language_browse(void) { @@ -415,7 +471,10 @@ &tagcache_menu, #endif &display_menu, &system_menu, - &bookmark_settings_menu, &browse_langs, &voice_settings_menu + &bookmark_settings_menu, &browse_langs, &voice_settings_menu, +#ifdef HOTKEY + &hotkey_menu, +#endif ); /* SETTINGS MENU */ /***********************************/ Index: apps/onplay.h =================================================================== --- apps/onplay.h (revision 25376) +++ apps/onplay.h (working copy) @@ -21,7 +21,7 @@ #ifndef _ONPLAY_H_ #define _ONPLAY_H_ -int onplay(char* file, int attr, int from_screen); +int onplay(char* file, int attr, int from_screen, bool hotkey); enum { ONPLAY_MAINMENU = -1, Index: apps/settings_list.c =================================================================== --- apps/settings_list.c (revision 25376) +++ apps/settings_list.c (working copy) @@ -56,6 +56,7 @@ #include "touchscreen.h" #include "ctype.h" /* For isspace() */ #endif +#include "hotkey.h" #define NVRAM(bytes) (bytes< ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id: hotkey.h 24791 2010-02-20 19:06:39Z kugel $ + * + * Copyright (C) 2002 Björn Stenberg + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +#ifndef _HOTKEY_H_ +#define _HOTKEY_H_ + +#ifdef HOTKEY +enum hotkey_settings { + HOTKEY_OFF, + HOTKEY_VIEW_PLAYLIST, +#ifdef HAVE_PITCHSCREEN + HOTKEY_PITCHSCREEN, +#endif + HOTKEY_DELETE, + HOTKEY_INSERT, +}; + +#define HOTKEY_WPS_DEFAULT HOTKEY_VIEW_PLAYLIST +#define HOTKEY_WPS_ID_DEFAULT LANG_VIEW_DYNAMIC_PLAYLIST +#define HOTKEY_TREE_DEFAULT HOTKEY_OFF +#define HOTKEY_TREE_ID_DEFAULT LANG_OFF + +#endif + +#endif Property changes on: apps/hotkey.h ___________________________________________________________________ Added: svn:executable + * Index: apps/features.txt =================================================================== --- apps/features.txt (revision 25376) +++ apps/features.txt (working copy) @@ -70,6 +70,10 @@ remote_button_hold #endif +#if defined(HOTKEY) +hotkey +#endif + #if defined(HAVE_LCD_BITMAP) lcd_bitmap #endif Index: apps/root_menu.h =================================================================== --- apps/root_menu.h (revision 25376) +++ apps/root_menu.h (working copy) @@ -53,6 +53,9 @@ GO_TO_BROWSEPLUGINS, GO_TO_TIMESCREEN, GO_TO_PLAYLIST_VIEWER, +#ifdef HOTKEY + MENU_SELECTED_HOTKEY, +#endif }; extern const struct menu_item_ex root_menu_; Index: apps/keymaps/keymap-vibe500.c =================================================================== --- apps/keymaps/keymap-vibe500.c (revision 25376) +++ apps/keymaps/keymap-vibe500.c (working copy) @@ -66,7 +66,11 @@ { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, { ACTION_WPS_BROWSE, BUTTON_OK|BUTTON_REL, BUTTON_OK }, { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_CANCEL, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_CANCEL, BUTTON_NONE }, +#endif { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_WPS_QUICKSCREEN, BUTTON_OK|BUTTON_REPEAT, BUTTON_OK }, @@ -76,6 +80,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_tree */ Index: apps/keymaps/keymap-m3.c =================================================================== --- apps/keymaps/keymap-m3.c (revision 25376) +++ apps/keymaps/keymap-m3.c (working copy) @@ -292,6 +292,9 @@ { ACTION_NONE, BUTTON_PLAY, BUTTON_NONE }, { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_MODE, BUTTON_REC }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_tree */ @@ -352,7 +355,11 @@ { ACTION_WPS_CONTEXT, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_MODE, BUTTON_REC }, +#else { ACTION_WPS_VIEW_PLAYLIST,BUTTON_REC|BUTTON_MODE, BUTTON_REC }, +#endif LAST_ITEM_IN_LIST }; /* button_context_wps */ Index: apps/keymaps/keymap-creativezv.c =================================================================== --- apps/keymaps/keymap-creativezv.c (revision 25376) +++ apps/keymaps/keymap-creativezv.c (working copy) @@ -92,7 +92,11 @@ { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_POWER, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, +#endif { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, @@ -109,6 +113,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-h1x0_h3x0.c =================================================================== --- apps/keymaps/keymap-h1x0_h3x0.c (revision 25376) +++ apps/keymaps/keymap-h1x0_h3x0.c (working copy) @@ -92,7 +92,11 @@ { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#endif LAST_ITEM_IN_LIST }; /* button_context_wps */ @@ -112,6 +116,9 @@ { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-iaudio67.c =================================================================== --- apps/keymaps/keymap-iaudio67.c (revision 25376) +++ apps/keymaps/keymap-iaudio67.c (working copy) @@ -71,7 +71,11 @@ { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, +#endif { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, LAST_ITEM_IN_LIST @@ -111,6 +115,9 @@ static const struct button_mapping button_context_tree[] = { // { ACTION_TREE_WPS, BUTTON_REC|BUTTON_VOLUP, BUTTON_REC }, // { ACTION_TREE_STOP, BUTTON_REC|BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_REC|BUTTON_VOLUP }, +#ifdef HOTKEY + // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ Index: apps/keymaps/keymap-player.c =================================================================== --- apps/keymaps/keymap-player.c (revision 25376) +++ apps/keymaps/keymap-player.c (working copy) @@ -63,7 +63,11 @@ { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, { ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_STOP, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST,BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST }; @@ -79,6 +83,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_ON, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_listtree */ Index: apps/keymaps/keymap-creativezvm.c =================================================================== --- apps/keymaps/keymap-creativezvm.c (revision 25376) +++ apps/keymaps/keymap-creativezvm.c (working copy) @@ -91,7 +91,11 @@ { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_POWER, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, +#endif { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, @@ -108,6 +112,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-yh8xx_yh9xx.c =================================================================== --- apps/keymaps/keymap-yh8xx_yh9xx.c (revision 25376) +++ apps/keymaps/keymap-yh8xx_yh9xx.c (working copy) @@ -96,7 +96,11 @@ { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, +#endif { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST @@ -117,6 +121,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-gigabeat.c =================================================================== --- apps/keymaps/keymap-gigabeat.c (revision 25376) +++ apps/keymaps/keymap-gigabeat.c (working copy) @@ -93,7 +93,11 @@ { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, +#endif { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, @@ -127,6 +131,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-gigabeat-s.c =================================================================== --- apps/keymaps/keymap-gigabeat-s.c (revision 25376) +++ apps/keymaps/keymap-gigabeat-s.c (working copy) @@ -100,7 +100,11 @@ { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_UP, BUTTON_BACK }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, +#endif { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, @@ -134,6 +138,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY,BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-c100.c =================================================================== --- apps/keymaps/keymap-c100.c (revision 25376) +++ apps/keymaps/keymap-c100.c (working copy) @@ -69,7 +69,11 @@ { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT }, { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, +#endif { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, LAST_ITEM_IN_LIST @@ -104,6 +108,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ Index: apps/keymaps/keymap-c200.c =================================================================== --- apps/keymaps/keymap-c200.c (revision 25376) +++ apps/keymaps/keymap-c200.c (working copy) @@ -81,7 +81,11 @@ { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN, BUTTON_NONE }, { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#endif LAST_ITEM_IN_LIST }; /* button_context_wps */ @@ -123,6 +127,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ Index: apps/keymaps/keymap-recorder.c =================================================================== --- apps/keymaps/keymap-recorder.c (revision 25376) +++ apps/keymaps/keymap-recorder.c (working copy) @@ -76,7 +76,11 @@ { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, +#else { ACTION_WPS_VIEW_PLAYLIST,BUTTON_F2|BUTTON_REL, BUTTON_F2 }, +#endif { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, @@ -107,6 +111,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, +#endif { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, Index: apps/keymaps/keymap-e200.c =================================================================== --- apps/keymaps/keymap-e200.c (revision 25376) +++ apps/keymaps/keymap-e200.c (working copy) @@ -80,7 +80,11 @@ { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#endif { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, @@ -115,6 +119,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_REC|BUTTON_REL, BUTTON_REC }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ Index: apps/keymaps/keymap-mini2440.c =================================================================== --- apps/keymaps/keymap-mini2440.c (revision 25376) +++ apps/keymaps/keymap-mini2440.c (working copy) @@ -95,7 +95,11 @@ { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, +#endif { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, @@ -129,6 +133,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-hdd6330.c =================================================================== --- apps/keymaps/keymap-hdd6330.c (revision 25376) +++ apps/keymaps/keymap-hdd6330.c (working copy) @@ -93,7 +93,11 @@ { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, +#endif { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, @@ -127,6 +131,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-sa9200.c =================================================================== --- apps/keymaps/keymap-sa9200.c (revision 25376) +++ apps/keymaps/keymap-sa9200.c (working copy) @@ -100,7 +100,11 @@ { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_PITCHSCREEN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, +#endif { ACTION_WPS_ID3SCREEN, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, LAST_ITEM_IN_LIST @@ -124,6 +128,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-touchscreen.c =================================================================== --- apps/keymaps/keymap-touchscreen.c (revision 25376) +++ apps/keymaps/keymap-touchscreen.c (working copy) @@ -92,7 +92,11 @@ { ACTION_WPS_MENU, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, { ACTION_WPS_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, +#endif { ACTION_WPS_REC, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, @@ -122,6 +126,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, { ACTION_TREE_STOP, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE) }; /* button_context_tree */ Index: apps/keymaps/keymap-clip.c =================================================================== --- apps/keymaps/keymap-clip.c (revision 25376) +++ apps/keymaps/keymap-clip.c (working copy) @@ -82,7 +82,11 @@ { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, +#endif #ifndef HAS_BUTTON_HOLD /* Clip+ */ { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE }, @@ -131,6 +135,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ Index: apps/keymaps/keymap-h10.c =================================================================== --- apps/keymaps/keymap-h10.c (revision 25376) +++ apps/keymaps/keymap-h10.c (working copy) @@ -87,7 +87,11 @@ { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_POWER|BUTTON_PLAY, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER|BUTTON_PLAY, BUTTON_NONE }, +#endif { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, @@ -146,6 +150,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_POWER|BUTTON_PLAY, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ Index: apps/keymaps/keymap-av300.c =================================================================== --- apps/keymaps/keymap-av300.c (revision 25376) +++ apps/keymaps/keymap-av300.c (working copy) @@ -75,7 +75,11 @@ { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, +#endif { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, @@ -106,6 +110,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, +#endif { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, { ACTION_LISTTREE_PGUP, BUTTON_ON|BUTTON_UP, BUTTON_ON }, { ACTION_LISTTREE_PGUP, BUTTON_UP|BUTTON_REL, BUTTON_ON|BUTTON_UP }, Index: apps/keymaps/keymap-ipod.c =================================================================== --- apps/keymaps/keymap-ipod.c (revision 25376) +++ apps/keymaps/keymap-ipod.c (working copy) @@ -59,6 +59,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_tree */ @@ -91,7 +94,11 @@ { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, +#endif { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, Index: apps/keymaps/keymap-mr100.c =================================================================== --- apps/keymaps/keymap-mr100.c (revision 25376) +++ apps/keymaps/keymap-mr100.c (working copy) @@ -94,7 +94,11 @@ { ACTION_WPS_ABSETA_PREVDIR,BUTTON_DISPLAY|BUTTON_LEFT, BUTTON_NONE }, { ACTION_WPS_ABRESET, BUTTON_DISPLAY|BUTTON_SELECT, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_UP, BUTTON_DISPLAY }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, +#endif { ACTION_WPS_ID3SCREEN, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, @@ -119,6 +123,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-meizu-m6sl.c =================================================================== --- apps/keymaps/keymap-meizu-m6sl.c (revision 25376) +++ apps/keymaps/keymap-meizu-m6sl.c (working copy) @@ -88,7 +88,11 @@ { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, +#endif { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, @@ -114,6 +118,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/keymaps/keymap-fuze.c =================================================================== --- apps/keymaps/keymap-fuze.c (revision 25376) +++ apps/keymaps/keymap-fuze.c (working copy) @@ -83,7 +83,11 @@ { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, +#endif LAST_ITEM_IN_LIST }; /* button_context_wps */ @@ -114,6 +118,9 @@ static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, { ACTION_TREE_STOP, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, +#ifdef HOTKEY + { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), }; /* button_context_tree */ Index: apps/keymaps/keymap-hdd1630.c =================================================================== --- apps/keymaps/keymap-hdd1630.c (revision 25376) +++ apps/keymaps/keymap-hdd1630.c (working copy) @@ -93,7 +93,11 @@ { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, +#ifdef HOTKEY + { ACTION_WPS_HOTKEY, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, +#else { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, +#endif { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, @@ -127,6 +131,9 @@ { ACTION_TREE_STOP, BUTTON_POWER, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE }, +#ifdef HOTKEY +// { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, +#endif LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) }; /* button_context_tree */ Index: apps/playlist_catalog.c =================================================================== --- apps/playlist_catalog.c (revision 25376) +++ apps/playlist_catalog.c (working copy) @@ -281,7 +281,7 @@ sel_file); if (onplay(playlist, FILE_ATTR_M3U, - CONTEXT_TREE) != ONPLAY_OK) + CONTEXT_TREE, false) != ONPLAY_OK) { result = 0; exit = true; Index: firmware/export/config/sansac100.h =================================================================== --- firmware/export/config/sansac100.h (revision 25376) +++ firmware/export/config/sansac100.h (working copy) @@ -126,3 +126,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/sansac200.h =================================================================== --- firmware/export/config/sansac200.h (revision 25376) +++ firmware/export/config/sansac200.h (working copy) @@ -205,3 +205,6 @@ #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 #define DEFAULT_REC_RIGHT_GAIN 23 + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/iriverh120.h =================================================================== --- firmware/export/config/iriverh120.h (revision 25376) +++ firmware/export/config/iriverh120.h (working copy) @@ -217,3 +217,6 @@ #define DEFAULT_REMOTE_CONTRAST_SETTING 42 #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/archosplayer.h =================================================================== --- firmware/export/config/archosplayer.h (revision 25376) +++ firmware/export/config/archosplayer.h (working copy) @@ -103,3 +103,5 @@ #define HAVE_SERIAL +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/gogearhdd1630.h =================================================================== --- firmware/export/config/gogearhdd1630.h (revision 25376) +++ firmware/export/config/gogearhdd1630.h (working copy) @@ -205,3 +205,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/ipodmini1g.h =================================================================== --- firmware/export/config/ipodmini1g.h (revision 25376) +++ firmware/export/config/ipodmini1g.h (working copy) @@ -198,3 +198,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/gigabeatfx.h =================================================================== --- firmware/export/config/gigabeatfx.h (revision 25376) +++ firmware/export/config/gigabeatfx.h (working copy) @@ -186,3 +186,5 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/iaudio7.h =================================================================== --- firmware/export/config/iaudio7.h (revision 25376) +++ firmware/export/config/iaudio7.h (working copy) @@ -160,3 +160,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/archosrecorder.h =================================================================== --- firmware/export/config/archosrecorder.h (revision 25376) +++ firmware/export/config/archosrecorder.h (working copy) @@ -134,3 +134,5 @@ #define MAX_CONTRAST_SETTING 63 #define HAVE_SERIAL +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/sansafuzev2.h =================================================================== --- firmware/export/config/sansafuzev2.h (revision 25376) +++ firmware/export/config/sansafuzev2.h (working copy) @@ -206,3 +206,5 @@ #define INCLUDE_TIMEOUT_API +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/samsungyh820.h =================================================================== --- firmware/export/config/samsungyh820.h (revision 25376) +++ firmware/export/config/samsungyh820.h (working copy) @@ -186,3 +186,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/samsungyh920.h =================================================================== --- firmware/export/config/samsungyh920.h (revision 25376) +++ firmware/export/config/samsungyh920.h (working copy) @@ -192,3 +192,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/vibe500.h =================================================================== --- firmware/export/config/vibe500.h (revision 25376) +++ firmware/export/config/vibe500.h (working copy) @@ -199,3 +199,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/ipod1g2g.h =================================================================== --- firmware/export/config/ipod1g2g.h (revision 25376) +++ firmware/export/config/ipod1g2g.h (working copy) @@ -169,3 +169,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/sansaclip.h =================================================================== --- firmware/export/config/sansaclip.h (revision 25376) +++ firmware/export/config/sansaclip.h (working copy) @@ -199,3 +199,6 @@ #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 #define DEFAULT_REC_RIGHT_GAIN 23 + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/ipodvideo.h =================================================================== --- firmware/export/config/ipodvideo.h (revision 25376) +++ firmware/export/config/ipodvideo.h (working copy) @@ -231,3 +231,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/creativezv.h =================================================================== --- firmware/export/config/creativezv.h (revision 25376) +++ firmware/export/config/creativezv.h (working copy) @@ -165,3 +165,5 @@ #define USB_PRODUCT_ID 0x4133 #define USB_NUM_ENDPOINTS 7 +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/gigabeats.h =================================================================== --- firmware/export/config/gigabeats.h (revision 25376) +++ firmware/export/config/gigabeats.h (working copy) @@ -214,3 +214,5 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/ipod4g.h =================================================================== --- firmware/export/config/ipod4g.h (revision 25376) +++ firmware/export/config/ipod4g.h (working copy) @@ -212,3 +212,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/meizum3.h =================================================================== --- firmware/export/config/meizum3.h (revision 25376) +++ firmware/export/config/meizum3.h (working copy) @@ -178,3 +178,5 @@ #define MAX_BRIGHTNESS_SETTING 15 #define DEFAULT_BRIGHTNESS_SETTING 10 +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/ipodcolor.h =================================================================== --- firmware/export/config/ipodcolor.h (revision 25376) +++ firmware/export/config/ipodcolor.h (working copy) @@ -194,3 +194,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/meizum6sl.h =================================================================== --- firmware/export/config/meizum6sl.h (revision 25376) +++ firmware/export/config/meizum6sl.h (working copy) @@ -176,3 +176,5 @@ #define MAX_BRIGHTNESS_SETTING 13 /* 3/16 (18.75%) */ #define DEFAULT_BRIGHTNESS_SETTING 8 /* 8/16 (50.00%) = x5 boot default */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/sansafuze.h =================================================================== --- firmware/export/config/sansafuze.h (revision 25376) +++ firmware/export/config/sansafuze.h (working copy) @@ -209,3 +209,5 @@ #define INCLUDE_TIMEOUT_API +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/meizum6sp.h =================================================================== --- firmware/export/config/meizum6sp.h (revision 25376) +++ firmware/export/config/meizum6sp.h (working copy) @@ -185,3 +185,5 @@ #define MAX_BRIGHTNESS_SETTING 13 /* 3/16 (18.75%) */ #define DEFAULT_BRIGHTNESS_SETTING 8 /* 8/16 (50.00%) = x5 boot default */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/gogearhdd6330.h =================================================================== --- firmware/export/config/gogearhdd6330.h (revision 25376) +++ firmware/export/config/gogearhdd6330.h (working copy) @@ -200,3 +200,5 @@ #define ICODE_ATTR_TREMOR_NOT_MDCT +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/ondavx747.h =================================================================== --- firmware/export/config/ondavx747.h (revision 25376) +++ firmware/export/config/ondavx747.h (working copy) @@ -218,3 +218,5 @@ #define USB_VENDOR_ID 0x07C4 #define USB_PRODUCT_ID 0xA4A5 +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/sansac200v2.h =================================================================== --- firmware/export/config/sansac200v2.h (revision 25376) +++ firmware/export/config/sansac200v2.h (working copy) @@ -201,3 +201,6 @@ #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 #define DEFAULT_REC_RIGHT_GAIN 23 + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/mini2440.h =================================================================== --- firmware/export/config/mini2440.h (revision 25376) +++ firmware/export/config/mini2440.h (working copy) @@ -154,3 +154,5 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/iriverh10_5gb.h =================================================================== --- firmware/export/config/iriverh10_5gb.h (revision 25376) +++ firmware/export/config/iriverh10_5gb.h (working copy) @@ -179,3 +179,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/iaudiom3.h =================================================================== --- firmware/export/config/iaudiom3.h (revision 25376) +++ firmware/export/config/iaudiom3.h (working copy) @@ -169,3 +169,6 @@ #define DEFAULT_CONTRAST_SETTING 24 #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/iaudiom5.h =================================================================== --- firmware/export/config/iaudiom5.h (revision 25376) +++ firmware/export/config/iaudiom5.h (working copy) @@ -190,3 +190,6 @@ #define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/lyreproto1.h =================================================================== --- firmware/export/config/lyreproto1.h (revision 25376) +++ firmware/export/config/lyreproto1.h (working copy) @@ -101,3 +101,5 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/zenvisionm60gb.h =================================================================== --- firmware/export/config/zenvisionm60gb.h (revision 25376) +++ firmware/export/config/zenvisionm60gb.h (working copy) @@ -166,3 +166,5 @@ #define USB_PRODUCT_ID 0x4133 #define USB_NUM_ENDPOINTS 7 +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/ipod3g.h =================================================================== --- firmware/export/config/ipod3g.h (revision 25376) +++ firmware/export/config/ipod3g.h (working copy) @@ -180,3 +180,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/tatungtpj1022.h =================================================================== --- firmware/export/config/tatungtpj1022.h (revision 25376) +++ firmware/export/config/tatungtpj1022.h (working copy) @@ -142,3 +142,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/iriverh100.h =================================================================== --- firmware/export/config/iriverh100.h (revision 25376) +++ firmware/export/config/iriverh100.h (working copy) @@ -216,3 +216,6 @@ #define DEFAULT_REMOTE_CONTRAST_SETTING 42 #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/iriverh300.h =================================================================== --- firmware/export/config/iriverh300.h (revision 25376) +++ firmware/export/config/iriverh300.h (working copy) @@ -204,3 +204,6 @@ #define MIN_REMOTE_CONTRAST_SETTING 5 #define MAX_REMOTE_CONTRAST_SETTING 63 #define DEFAULT_REMOTE_CONTRAST_SETTING 42 + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/archosondiofm.h =================================================================== --- firmware/export/config/archosondiofm.h (revision 25376) +++ firmware/export/config/archosondiofm.h (working copy) @@ -140,3 +140,5 @@ #define MIN_CONTRAST_SETTING 5 #define MAX_CONTRAST_SETTING 63 +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/sansae200.h =================================================================== --- firmware/export/config/sansae200.h (revision 25376) +++ firmware/export/config/sansae200.h (working copy) @@ -214,3 +214,5 @@ #define IRAMORIG 0x40004000 #endif +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/ipodnano2g.h =================================================================== --- firmware/export/config/ipodnano2g.h (revision 25376) +++ firmware/export/config/ipodnano2g.h (working copy) @@ -221,3 +221,5 @@ #define USB_WRITE_BUFFER_SIZE (1024*64) +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/sansaview.h =================================================================== --- firmware/export/config/sansaview.h (revision 25376) +++ firmware/export/config/sansaview.h (working copy) @@ -201,3 +201,6 @@ #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 #define DEFAULT_REC_RIGHT_GAIN 23 + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/logikdax.h =================================================================== --- firmware/export/config/logikdax.h (revision 25376) +++ firmware/export/config/logikdax.h (working copy) @@ -145,3 +145,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/gogearsa9200.h =================================================================== --- firmware/export/config/gogearsa9200.h (revision 25376) +++ firmware/export/config/gogearsa9200.h (working copy) @@ -194,3 +194,5 @@ #define INCLUDE_TIMEOUT_API +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/ondavx777.h =================================================================== --- firmware/export/config/ondavx777.h (revision 25376) +++ firmware/export/config/ondavx777.h (working copy) @@ -205,3 +205,5 @@ #define USB_VENDOR_ID 0x07C4 #define USB_PRODUCT_ID 0xA4A5 +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/sansam200.h =================================================================== --- firmware/export/config/sansam200.h (revision 25376) +++ firmware/export/config/sansam200.h (working copy) @@ -134,3 +134,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/iriverifp7xx.h =================================================================== --- firmware/export/config/iriverifp7xx.h (revision 25376) +++ firmware/export/config/iriverifp7xx.h (working copy) @@ -122,3 +122,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/iriverh10.h =================================================================== --- firmware/export/config/iriverh10.h (revision 25376) +++ firmware/export/config/iriverh10.h (working copy) @@ -191,3 +191,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/cowond2.h =================================================================== --- firmware/export/config/cowond2.h (revision 25376) +++ firmware/export/config/cowond2.h (working copy) @@ -169,3 +169,5 @@ #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/zenvisionm30gb.h =================================================================== --- firmware/export/config/zenvisionm30gb.h (revision 25376) +++ firmware/export/config/zenvisionm30gb.h (working copy) @@ -174,3 +174,5 @@ #define BUTTON_DEBUG */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/samsungyh925.h =================================================================== --- firmware/export/config/samsungyh925.h (revision 25376) +++ firmware/export/config/samsungyh925.h (working copy) @@ -190,3 +190,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/mrobe100.h =================================================================== --- firmware/export/config/mrobe100.h (revision 25376) +++ firmware/export/config/mrobe100.h (working copy) @@ -205,3 +205,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/iaudiox5.h =================================================================== --- firmware/export/config/iaudiox5.h (revision 25376) +++ firmware/export/config/iaudiox5.h (working copy) @@ -205,3 +205,6 @@ #define MIN_REMOTE_CONTRAST_SETTING 10 #define MAX_REMOTE_CONTRAST_SETTING 35 #define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */ + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/archosfmrecorder.h =================================================================== --- firmware/export/config/archosfmrecorder.h (revision 25376) +++ firmware/export/config/archosfmrecorder.h (working copy) @@ -140,3 +140,5 @@ #define MIN_CONTRAST_SETTING 5 #define MAX_CONTRAST_SETTING 63 +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/mrobe500.h =================================================================== --- firmware/export/config/mrobe500.h (revision 25376) +++ firmware/export/config/mrobe500.h (working copy) @@ -256,3 +256,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/samsungyps3.h =================================================================== --- firmware/export/config/samsungyps3.h (revision 25376) +++ firmware/export/config/samsungyps3.h (working copy) @@ -180,3 +180,5 @@ #define MAX_BRIGHTNESS_SETTING 15 #define DEFAULT_BRIGHTNESS_SETTING 10 +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/ipodnano1g.h =================================================================== --- firmware/export/config/ipodnano1g.h (revision 25376) +++ firmware/export/config/ipodnano1g.h (working copy) @@ -197,3 +197,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/ipodmini2g.h =================================================================== --- firmware/export/config/ipodmini2g.h (revision 25376) +++ firmware/export/config/ipodmini2g.h (working copy) @@ -208,3 +208,6 @@ * writes appear to be ~25% slower. */ #define HAVE_ATA_DMA + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/ondavx767.h =================================================================== --- firmware/export/config/ondavx767.h (revision 25376) +++ firmware/export/config/ondavx767.h (working copy) @@ -165,3 +165,5 @@ #define USB_VENDOR_ID 0x07C4 #define USB_PRODUCT_ID 0xA4A5 +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/sansae200v2.h =================================================================== --- firmware/export/config/sansae200v2.h (revision 25376) +++ firmware/export/config/sansae200v2.h (working copy) @@ -211,3 +211,6 @@ #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 #define DEFAULT_REC_RIGHT_GAIN 23 + +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/archosondiosp.h =================================================================== --- firmware/export/config/archosondiosp.h (revision 25376) +++ firmware/export/config/archosondiosp.h (working copy) @@ -124,3 +124,5 @@ #define MIN_CONTRAST_SETTING 5 #define MAX_CONTRAST_SETTING 63 +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/archosrecorderv2.h =================================================================== --- firmware/export/config/archosrecorderv2.h (revision 25376) +++ firmware/export/config/archosrecorderv2.h (working copy) @@ -140,3 +140,5 @@ #define MIN_CONTRAST_SETTING 5 #define MAX_CONTRAST_SETTING 63 +/* Define this if a programmable hotkey is mapped */ +#define HOTKEY Index: firmware/export/config/sansam200v4.h =================================================================== --- firmware/export/config/sansam200v4.h (revision 25376) +++ firmware/export/config/sansam200v4.h (working copy) @@ -163,3 +163,5 @@ #define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/sansaclipplus.h =================================================================== --- firmware/export/config/sansaclipplus.h (revision 25376) +++ firmware/export/config/sansaclipplus.h (working copy) @@ -218,3 +218,6 @@ #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 #define DEFAULT_REC_RIGHT_GAIN 23 + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY Index: firmware/export/config/sansaclipv2.h =================================================================== --- firmware/export/config/sansaclipv2.h (revision 25376) +++ firmware/export/config/sansaclipv2.h (working copy) @@ -213,3 +213,6 @@ #define DEFAULT_REC_MIC_GAIN 23 #define DEFAULT_REC_LEFT_GAIN 23 #define DEFAULT_REC_RIGHT_GAIN 23 + +/* Define this if a programmable hotkey is mapped */ +//#define HOTKEY