summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-08-04 13:40:24 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-08-04 13:40:24 +0000
commit32dfc0cdc19eca850aab4fd994b32f8a1528e4c6 (patch)
tree0778f103286564c4f905e88f87ccc19babdeb560
parent44ffa3ef93db8a4f5c56dfcb49ec7cb1e4c613f8 (diff)
Add a plugin activity which to the %cs screen option list
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30253 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/misc.h3
-rw-r--r--apps/plugin.c3
-rw-r--r--manual/appendix/wps_tags.tex2
3 files changed, 6 insertions, 2 deletions
diff --git a/apps/misc.h b/apps/misc.h
index 1e151f0ebc..05d8316783 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -114,7 +114,8 @@ enum current_activity {
ACTIVITY_QUICKSCREEN,
ACTIVITY_PITCHSCREEN,
ACTIVITY_OPTIONSELECT,
- ACTIVITY_PLAYLISTBROWSER
+ ACTIVITY_PLAYLISTBROWSER,
+ ACTIVITY_PLUGIN
};
#if CONFIG_CODEC == SWCODEC
diff --git a/apps/plugin.c b/apps/plugin.c
index c12a996408..50fbb37012 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -864,6 +864,7 @@ int plugin_load(const char* plugin, const void* parameter)
lcd_remote_clear_display();
lcd_remote_update();
#endif
+ push_current_activity(ACTIVITY_PLUGIN);
FOR_NB_SCREENS(i)
viewportmanager_theme_enable(i, false, NULL);
@@ -877,6 +878,8 @@ int plugin_load(const char* plugin, const void* parameter)
#endif
rc = p_hdr->entry_point(parameter);
+
+ pop_current_activity();
if (!pfn_tsr_exit)
{ /* close handle if plugin is no tsr one */
diff --git a/manual/appendix/wps_tags.tex b/manual/appendix/wps_tags.tex
index 02561c5d6e..01bf3cc874 100644
--- a/manual/appendix/wps_tags.tex
+++ b/manual/appendix/wps_tags.tex
@@ -269,7 +269,7 @@ Example: \config{\%?mp<Stop|Play|Pause|Ffwd|Rew|Rec|Rec pause|FM|FM pause>}
\config{\%cs} & The current screen, 1-15, in the order:
Menus, WPS, Recording screen, FM Radio screen, Current Playlist screen,
Settings menus, File browser, Database, Plugins, Quickscreen,
- Pitchscreen, Setting chooser, Playlist Catalog Viewer\\
+ Pitchscreen, Setting chooser, Playlist Catalog Viewer, Plugin\\
\end{tagmap}
The tag can also be used as the switch in a conditional tag. For players without
some capabilities (e.g. having no FM radio) some values will be never yielded.