mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-10-13 18:17:39 -04:00
get rid of ACTION_F3 (leftover from Archos days)
Change-Id: I8f602299bbc8caf6c8189361dbd41af31f19c1b3
This commit is contained in:
parent
2e2e899869
commit
ff6e175c20
6 changed files with 3 additions and 30 deletions
|
@ -146,7 +146,6 @@ enum {
|
||||||
ACTION_STD_REC,
|
ACTION_STD_REC,
|
||||||
ACTION_STD_HOTKEY,
|
ACTION_STD_HOTKEY,
|
||||||
|
|
||||||
ACTION_F3, /* just so everything works again, possibly change me */
|
|
||||||
/* code context actions */
|
/* code context actions */
|
||||||
|
|
||||||
/* WPS codes */
|
/* WPS codes */
|
||||||
|
|
|
@ -844,16 +844,6 @@ long gui_wps_show(void)
|
||||||
#endif /* HAVE_QUICKSCREEN */
|
#endif /* HAVE_QUICKSCREEN */
|
||||||
|
|
||||||
/* screen settings */
|
/* screen settings */
|
||||||
#ifdef BUTTON_F3
|
|
||||||
case ACTION_F3:
|
|
||||||
{
|
|
||||||
gwps_leave_wps();
|
|
||||||
if (quick_screen_f3(BUTTON_F3))
|
|
||||||
return GO_TO_ROOT;
|
|
||||||
restore = true;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
#endif /* BUTTON_F3 */
|
|
||||||
|
|
||||||
/* pitch screen */
|
/* pitch screen */
|
||||||
#ifdef HAVE_PITCHCONTROL
|
#ifdef HAVE_PITCHCONTROL
|
||||||
|
|
|
@ -47,7 +47,6 @@ static const struct button_mapping button_context_standard[] = {
|
||||||
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_F3, BUTTON_, BUTTON_ }, */
|
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST
|
LAST_ITEM_IN_LIST
|
||||||
}; /* button_context_standard */
|
}; /* button_context_standard */
|
||||||
|
@ -168,7 +167,6 @@ static const struct button_mapping button_context_recscreen[] = {
|
||||||
{ ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
|
{ ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
|
||||||
{ ACTION_REC_NEWFILE, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC },
|
{ ACTION_REC_NEWFILE, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC },
|
||||||
/* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */
|
/* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_REC_F3, BUTTON_, BUTTON_ }, */
|
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
|
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
|
||||||
}; /* button_context_recscreen */
|
}; /* button_context_recscreen */
|
||||||
|
@ -212,7 +210,6 @@ static const struct button_mapping button_rc_context_standard[] = {
|
||||||
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_F3, BUTTON_, BUTTON_ }, */
|
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST
|
LAST_ITEM_IN_LIST
|
||||||
}; /* button_context_standard */
|
}; /* button_context_standard */
|
||||||
|
|
|
@ -47,7 +47,6 @@ static const struct button_mapping button_context_standard[] = {
|
||||||
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
|
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
|
||||||
/* { ACTION_F3, BUTTON_, BUTTON_ }, */
|
|
||||||
|
|
||||||
LAST_ITEM_IN_LIST
|
LAST_ITEM_IN_LIST
|
||||||
}; /* button_context_standard */
|
}; /* button_context_standard */
|
||||||
|
|
|
@ -509,7 +509,6 @@ int handle_radio_presets(void)
|
||||||
next_station(0);
|
next_station(0);
|
||||||
result = 1;
|
result = 1;
|
||||||
break;
|
break;
|
||||||
case ACTION_F3:
|
|
||||||
case ACTION_STD_CONTEXT:
|
case ACTION_STD_CONTEXT:
|
||||||
selected_preset = gui_synclist_get_sel_pos(&lists);
|
selected_preset = gui_synclist_get_sel_pos(&lists);
|
||||||
do_menu(&handle_radio_preset_menu, NULL, NULL, false);
|
do_menu(&handle_radio_preset_menu, NULL, NULL, false);
|
||||||
|
|
11
apps/tree.c
11
apps/tree.c
|
@ -743,17 +743,6 @@ static int dirbrowse(void)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
#ifdef BUTTON_F3
|
|
||||||
case ACTION_F3:
|
|
||||||
/* don't enter f3 from plugin browser */
|
|
||||||
if (*tc.dirfilter < NUM_FILTER_MODES)
|
|
||||||
{
|
|
||||||
if (quick_screen_f3(ACTION_F3))
|
|
||||||
reload_dir = true;
|
|
||||||
restore = true;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_HOTKEY
|
#ifdef HAVE_HOTKEY
|
||||||
case ACTION_TREE_HOTKEY:
|
case ACTION_TREE_HOTKEY:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue