diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 19:19:47 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 19:20:47 -0400 |
commit | ff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1 (patch) | |
tree | 3c19302909b689e98a25a3f7a8b01206fdbc157e /apps | |
parent | 2e2e899869aa2aabd749fed38701708b8dd00402 (diff) | |
download | rockbox-ff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1.tar.gz rockbox-ff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1.zip |
get rid of ACTION_F3 (leftover from Archos days)
Change-Id: I8f602299bbc8caf6c8189361dbd41af31f19c1b3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.h | 1 | ||||
-rw-r--r-- | apps/gui/wps.c | 10 | ||||
-rw-r--r-- | apps/keymaps/keymap-mpio-hd200.c | 7 | ||||
-rw-r--r-- | apps/keymaps/keymap-mpio-hd300.c | 3 | ||||
-rw-r--r-- | apps/radio/presets.c | 1 | ||||
-rw-r--r-- | apps/tree.c | 11 |
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 { | |||
146 | ACTION_STD_REC, | 146 | ACTION_STD_REC, |
147 | ACTION_STD_HOTKEY, | 147 | ACTION_STD_HOTKEY, |
148 | 148 | ||
149 | ACTION_F3, /* just so everything works again, possibly change me */ | ||
150 | /* code context actions */ | 149 | /* code context actions */ |
151 | 150 | ||
152 | /* WPS codes */ | 151 | /* 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) | |||
844 | #endif /* HAVE_QUICKSCREEN */ | 844 | #endif /* HAVE_QUICKSCREEN */ |
845 | 845 | ||
846 | /* screen settings */ | 846 | /* screen settings */ |
847 | #ifdef BUTTON_F3 | ||
848 | case ACTION_F3: | ||
849 | { | ||
850 | gwps_leave_wps(); | ||
851 | if (quick_screen_f3(BUTTON_F3)) | ||
852 | return GO_TO_ROOT; | ||
853 | restore = true; | ||
854 | } | ||
855 | break; | ||
856 | #endif /* BUTTON_F3 */ | ||
857 | 847 | ||
858 | /* pitch screen */ | 848 | /* pitch screen */ |
859 | #ifdef HAVE_PITCHCONTROL | 849 | #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[] = { | |||
47 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ | 47 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ |
48 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ | 48 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ |
49 | /* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */ | 49 | /* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */ |
50 | /* { ACTION_F3, BUTTON_, BUTTON_ }, */ | 50 | |
51 | |||
52 | LAST_ITEM_IN_LIST | 51 | LAST_ITEM_IN_LIST |
53 | }; /* button_context_standard */ | 52 | }; /* button_context_standard */ |
54 | 53 | ||
@@ -168,7 +167,6 @@ static const struct button_mapping button_context_recscreen[] = { | |||
168 | { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, | 167 | { ACTION_REC_PAUSE, BUTTON_PLAY, BUTTON_NONE }, |
169 | { ACTION_REC_NEWFILE, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC }, | 168 | { ACTION_REC_NEWFILE, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_FUNC }, |
170 | /* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */ | 169 | /* { ACTION_REC_F2, BUTTON_, BUTTON_ }, */ |
171 | /* { ACTION_REC_F3, BUTTON_, BUTTON_ }, */ | ||
172 | 170 | ||
173 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 171 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
174 | }; /* button_context_recscreen */ | 172 | }; /* button_context_recscreen */ |
@@ -212,8 +210,7 @@ static const struct button_mapping button_rc_context_standard[] = { | |||
212 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ | 210 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ |
213 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ | 211 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ |
214 | /* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */ | 212 | /* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */ |
215 | /* { ACTION_F3, BUTTON_, BUTTON_ }, */ | 213 | |
216 | |||
217 | LAST_ITEM_IN_LIST | 214 | LAST_ITEM_IN_LIST |
218 | }; /* button_context_standard */ | 215 | }; /* button_context_standard */ |
219 | 216 | ||
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[] = { | |||
47 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ | 47 | /* { ACTION_STD_KEYLOCK, BUTTON_, BUTTON_ }, */ |
48 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ | 48 | /* { ACTION_STD_REC, BUTTON_, BUTTON_ }, */ |
49 | /* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */ | 49 | /* { ACTION_STD_HOTKEY, BUTTON_, BUTTON_ }, */ |
50 | /* { ACTION_F3, BUTTON_, BUTTON_ }, */ | 50 | |
51 | |||
52 | LAST_ITEM_IN_LIST | 51 | LAST_ITEM_IN_LIST |
53 | }; /* button_context_standard */ | 52 | }; /* button_context_standard */ |
54 | 53 | ||
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) | |||
509 | next_station(0); | 509 | next_station(0); |
510 | result = 1; | 510 | result = 1; |
511 | break; | 511 | break; |
512 | case ACTION_F3: | ||
513 | case ACTION_STD_CONTEXT: | 512 | case ACTION_STD_CONTEXT: |
514 | selected_preset = gui_synclist_get_sel_pos(&lists); | 513 | selected_preset = gui_synclist_get_sel_pos(&lists); |
515 | do_menu(&handle_radio_preset_menu, NULL, NULL, false); | 514 | 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) | |||
743 | } | 743 | } |
744 | break; | 744 | break; |
745 | #endif | 745 | #endif |
746 | #ifdef BUTTON_F3 | ||
747 | case ACTION_F3: | ||
748 | /* don't enter f3 from plugin browser */ | ||
749 | if (*tc.dirfilter < NUM_FILTER_MODES) | ||
750 | { | ||
751 | if (quick_screen_f3(ACTION_F3)) | ||
752 | reload_dir = true; | ||
753 | restore = true; | ||
754 | } | ||
755 | break; | ||
756 | #endif | ||
757 | 746 | ||
758 | #ifdef HAVE_HOTKEY | 747 | #ifdef HAVE_HOTKEY |
759 | case ACTION_TREE_HOTKEY: | 748 | case ACTION_TREE_HOTKEY: |