diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-08-05 00:47:11 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-08-05 00:47:11 +0000 |
commit | e918b7b9734ff3e45c19b6d1f7183dc176dfb205 (patch) | |
tree | 2d419cc7a010d92c090a03c9514b97847ca24021 | |
parent | c027dc20be013dc065d8e847f9048c39606e183d (diff) | |
download | rockbox-e918b7b9734ff3e45c19b6d1f7183dc176dfb205.tar.gz rockbox-e918b7b9734ff3e45c19b6d1f7183dc176dfb205.zip |
Add a %cs item for the context menus
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30258 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/misc.h | 3 | ||||
-rw-r--r-- | apps/onplay.c | 5 | ||||
-rw-r--r-- | manual/appendix/wps_tags.tex | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/apps/misc.h b/apps/misc.h index 05d8316783..1fbff9eb2a 100644 --- a/apps/misc.h +++ b/apps/misc.h | |||
@@ -115,7 +115,8 @@ enum current_activity { | |||
115 | ACTIVITY_PITCHSCREEN, | 115 | ACTIVITY_PITCHSCREEN, |
116 | ACTIVITY_OPTIONSELECT, | 116 | ACTIVITY_OPTIONSELECT, |
117 | ACTIVITY_PLAYLISTBROWSER, | 117 | ACTIVITY_PLAYLISTBROWSER, |
118 | ACTIVITY_PLUGIN | 118 | ACTIVITY_PLUGIN, |
119 | ACTIVITY_CONTEXTMENU | ||
119 | }; | 120 | }; |
120 | 121 | ||
121 | #if CONFIG_CODEC == SWCODEC | 122 | #if CONFIG_CODEC == SWCODEC |
diff --git a/apps/onplay.c b/apps/onplay.c index da06f937b6..03981c6310 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -1347,12 +1347,15 @@ int onplay(char* file, int attr, int from, bool hotkey) | |||
1347 | #else | 1347 | #else |
1348 | (void)hotkey; | 1348 | (void)hotkey; |
1349 | #endif | 1349 | #endif |
1350 | |||
1351 | push_current_activity(ACTIVITY_CONTEXTMENU); | ||
1350 | if (context == CONTEXT_WPS) | 1352 | if (context == CONTEXT_WPS) |
1351 | menu = &wps_onplay_menu; | 1353 | menu = &wps_onplay_menu; |
1352 | else | 1354 | else |
1353 | menu = &tree_onplay_menu; | 1355 | menu = &tree_onplay_menu; |
1354 | menu_selection = do_menu(menu, NULL, NULL, false); | 1356 | menu_selection = do_menu(menu, NULL, NULL, false); |
1355 | 1357 | pop_current_activity(); | |
1358 | |||
1356 | switch (menu_selection) | 1359 | switch (menu_selection) |
1357 | { | 1360 | { |
1358 | case GO_TO_WPS: | 1361 | case GO_TO_WPS: |
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex index 01bf3cc874..b869d532f3 100644 --- a/manual/appendix/wps_tags.tex +++ b/manual/appendix/wps_tags.tex | |||
@@ -269,7 +269,8 @@ Example: \config{\%?mp<Stop|Play|Pause|Ffwd|Rew|Rec|Rec pause|FM|FM pause>} | |||
269 | \config{\%cs} & The current screen, 1-15, in the order: | 269 | \config{\%cs} & The current screen, 1-15, in the order: |
270 | Menus, WPS, Recording screen, FM Radio screen, Current Playlist screen, | 270 | Menus, WPS, Recording screen, FM Radio screen, Current Playlist screen, |
271 | Settings menus, File browser, Database, Plugins, Quickscreen, | 271 | Settings menus, File browser, Database, Plugins, Quickscreen, |
272 | Pitchscreen, Setting chooser, Playlist Catalog Viewer, Plugin\\ | 272 | Pitchscreen, Setting chooser, Playlist Catalog Viewer, Plugin, |
273 | Conext Menu\\ | ||
273 | \end{tagmap} | 274 | \end{tagmap} |
274 | The tag can also be used as the switch in a conditional tag. For players without | 275 | The tag can also be used as the switch in a conditional tag. For players without |
275 | some capabilities (e.g. having no FM radio) some values will be never yielded. | 276 | some capabilities (e.g. having no FM radio) some values will be never yielded. |