Finally use the rec button to get to the rec screen on sansa and iriver hxxx. hold rec to get there... short press still is unused
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14141 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
c77b14571e
commit
73336e9729
6 changed files with 28 additions and 1 deletions
|
@ -91,6 +91,7 @@ enum {
|
||||||
ACTION_STD_MENU,
|
ACTION_STD_MENU,
|
||||||
ACTION_STD_QUICKSCREEN,
|
ACTION_STD_QUICKSCREEN,
|
||||||
ACTION_STD_KEYLOCK,
|
ACTION_STD_KEYLOCK,
|
||||||
|
ACTION_STD_REC,
|
||||||
|
|
||||||
ACTION_F3, /* just so everything works again, possibly change me */
|
ACTION_F3, /* just so everything works again, possibly change me */
|
||||||
/* code context actions */
|
/* code context actions */
|
||||||
|
@ -111,6 +112,7 @@ enum {
|
||||||
ACTION_WPS_CONTEXT,
|
ACTION_WPS_CONTEXT,
|
||||||
ACTION_WPS_QUICKSCREEN,/* optional */
|
ACTION_WPS_QUICKSCREEN,/* optional */
|
||||||
ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */
|
ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */
|
||||||
|
ACTION_WPS_REC,
|
||||||
#if 0
|
#if 0
|
||||||
ACTION_WPSAB_SINGLE, /* This needs to be #defined in
|
ACTION_WPSAB_SINGLE, /* This needs to be #defined in
|
||||||
the config-<target>.h to one of the ACTION_WPS_ actions
|
the config-<target>.h to one of the ACTION_WPS_ actions
|
||||||
|
|
|
@ -618,7 +618,11 @@ long gui_wps_show(void)
|
||||||
update_track = true;
|
update_track = true;
|
||||||
ffwd_rew(button); /* hopefully fix the ffw/rwd bug */
|
ffwd_rew(button); /* hopefully fix the ffw/rwd bug */
|
||||||
break;
|
break;
|
||||||
|
#ifdef HAVE_RECORDING
|
||||||
|
case ACTION_WPS_REC:
|
||||||
|
exit = true;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
case SYS_POWEROFF:
|
case SYS_POWEROFF:
|
||||||
bookmark_autobookmark();
|
bookmark_autobookmark();
|
||||||
#if LCD_DEPTH > 1
|
#if LCD_DEPTH > 1
|
||||||
|
@ -676,6 +680,10 @@ long gui_wps_show(void)
|
||||||
audio_stop();
|
audio_stop();
|
||||||
#ifdef AB_REPEAT_ENABLE
|
#ifdef AB_REPEAT_ENABLE
|
||||||
ab_reset_markers();
|
ab_reset_markers();
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_RECORDING
|
||||||
|
if (button == ACTION_WPS_REC)
|
||||||
|
return GO_TO_RECSCREEN;
|
||||||
#endif
|
#endif
|
||||||
if (global_settings.browse_current)
|
if (global_settings.browse_current)
|
||||||
return GO_TO_PREVIOUS_BROWSER;
|
return GO_TO_PREVIOUS_BROWSER;
|
||||||
|
|
|
@ -37,6 +37,7 @@ static const struct button_mapping button_context_standard[] = {
|
||||||
{ ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
|
{ ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
|
||||||
|
|
||||||
{ ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
|
{ ACTION_STD_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
|
||||||
|
{ ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
|
||||||
|
|
||||||
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
|
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
|
||||||
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
|
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
|
||||||
|
@ -76,6 +77,7 @@ static const struct button_mapping button_context_wps[] = {
|
||||||
{ ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
|
{ ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
|
||||||
|
|
||||||
{ ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
|
{ ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
|
||||||
|
{ ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
|
||||||
|
|
||||||
{ ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT },
|
{ ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT },
|
||||||
{ ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT },
|
{ ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT },
|
||||||
|
|
|
@ -61,6 +61,7 @@ static const struct button_mapping button_context_standard[] = {
|
||||||
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
|
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
|
||||||
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
|
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
|
||||||
{ ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
|
{ ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
|
||||||
|
{ ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST
|
LAST_ITEM_IN_LIST
|
||||||
}; /* button_context_standard */
|
}; /* button_context_standard */
|
||||||
|
@ -88,6 +89,7 @@ static const struct button_mapping button_context_wps[] = {
|
||||||
{ ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
|
{ ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
|
||||||
{ ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON },
|
{ ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON },
|
||||||
{ ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE },
|
{ ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE },
|
||||||
|
{ ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST
|
LAST_ITEM_IN_LIST
|
||||||
}; /* button_context_wps */
|
}; /* button_context_wps */
|
||||||
|
|
|
@ -340,6 +340,14 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected)
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_RECORDING
|
||||||
|
if (action == ACTION_STD_REC)
|
||||||
|
{
|
||||||
|
ret = GO_TO_RECSCREEN;
|
||||||
|
done = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
#endif
|
||||||
if (action == ACTION_TREE_WPS)
|
if (action == ACTION_TREE_WPS)
|
||||||
{
|
{
|
||||||
ret = GO_TO_PREVIOUS_MUSIC;
|
ret = GO_TO_PREVIOUS_MUSIC;
|
||||||
|
|
|
@ -630,6 +630,11 @@ static int dirbrowse()
|
||||||
return GO_TO_ROOT;
|
return GO_TO_ROOT;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#ifdef HAVE_RECORDING
|
||||||
|
case ACTION_STD_REC:
|
||||||
|
return GO_TO_RECSCREEN;
|
||||||
|
#endif
|
||||||
|
|
||||||
case ACTION_TREE_WPS:
|
case ACTION_TREE_WPS:
|
||||||
return GO_TO_PREVIOUS_MUSIC;
|
return GO_TO_PREVIOUS_MUSIC;
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in a new issue