summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-08 19:19:47 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-08 19:20:47 -0400
commitff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1 (patch)
tree3c19302909b689e98a25a3f7a8b01206fdbc157e /apps
parent2e2e899869aa2aabd749fed38701708b8dd00402 (diff)
downloadrockbox-ff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1.tar.gz
rockbox-ff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1.tar.bz2
rockbox-ff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1.zip
get rid of ACTION_F3 (leftover from Archos days)
Change-Id: I8f602299bbc8caf6c8189361dbd41af31f19c1b3
Diffstat (limited to 'apps')
-rw-r--r--apps/action.h1
-rw-r--r--apps/gui/wps.c10
-rw-r--r--apps/keymaps/keymap-mpio-hd200.c7
-rw-r--r--apps/keymaps/keymap-mpio-hd300.c3
-rw-r--r--apps/radio/presets.c1
-rw-r--r--apps/tree.c11
6 files changed, 3 insertions, 30 deletions
diff --git a/apps/action.h b/apps/action.h
index 42074071cb..3f0d593d6a 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -146,7 +146,6 @@ enum {
ACTION_STD_REC,
ACTION_STD_HOTKEY,
- ACTION_F3, /* just so everything works again, possibly change me */
/* code context actions */
/* WPS codes */
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 8a51d9b810..846c952baf 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -844,16 +844,6 @@ long gui_wps_show(void)
#endif /* HAVE_QUICKSCREEN */
/* 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 */
#ifdef HAVE_PITCHCONTROL
diff --git a/apps/keymaps/keymap-mpio-hd200.c b/apps/keymaps/keymap-mpio-hd200.c
index 8e0bf00187..71b3190384 100644
--- a/apps/keymaps/keymap-mpio-hd200.c
+++ b/apps/keymaps/keymap-mpio-hd200.c
@@ -47,8 +47,7 @@ static const struct button_mapping button_context_standard[] = {
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
-/* { ACTION_F3, BUTTON_, BUTTON_ }, */
-
+
LAST_ITEM_IN_LIST
}; /* button_context_standard */
@@ -168,7 +167,6 @@ static const struct button_mapping button_context_recscreen[] = {
{ ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE },
{ ACTION_REC_NEWFILE, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC },
/* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */
-/* { ACTION_REC_F3, BUTTON_, BUTTON_ }, */
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
}; /* button_context_recscreen */
@@ -212,8 +210,7 @@ static const struct button_mapping button_rc_context_standard[] = {
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
-/* { ACTION_F3, BUTTON_, BUTTON_ }, */
-
+
LAST_ITEM_IN_LIST
}; /* button_context_standard */
diff --git a/apps/keymaps/keymap-mpio-hd300.c b/apps/keymaps/keymap-mpio-hd300.c
index 2e0b9c06a5..cdb617bed0 100644
--- a/apps/keymaps/keymap-mpio-hd300.c
+++ b/apps/keymaps/keymap-mpio-hd300.c
@@ -47,8 +47,7 @@ static const struct button_mapping button_context_standard[] = {
/* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */
/* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */
/* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */
-/* { ACTION_F3, BUTTON_, BUTTON_ }, */
-
+
LAST_ITEM_IN_LIST
}; /* button_context_standard */
diff --git a/apps/radio/presets.c b/apps/radio/presets.c
index 0d3156b144..6db6e4686b 100644
--- a/apps/radio/presets.c
+++ b/apps/radio/presets.c
@@ -509,7 +509,6 @@ int handle_radio_presets(void)
next_station(0);
result = 1;
break;
- case ACTION_F3:
case ACTION_STD_CONTEXT:
selected_preset = gui_synclist_get_sel_pos(&lists);
do_menu(&handle_radio_preset_menu, NULL, NULL, false);
diff --git a/apps/tree.c b/apps/tree.c
index 48723c4f2e..196839f055 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -743,17 +743,6 @@ static int dirbrowse(void)
}
break;
#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
case ACTION_TREE_HOTKEY: