diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2011-06-01 14:41:49 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2011-06-01 14:41:49 +0000 |
commit | b58d3656d79e5f9752a22d55c139294412084e4f (patch) | |
tree | bd98c9d2ab0db1e0df432814bb398cdb49739fe1 /apps/gui/skin_engine/skin_tokens.c | |
parent | c54f4b34400ea96bd3e2d86ba919a0ae509a56a9 (diff) | |
download | rockbox-b58d3656d79e5f9752a22d55c139294412084e4f.tar.gz rockbox-b58d3656d79e5f9752a22d55c139294412084e4f.zip |
FS#11925 - Add a proper system to keep track of the current screen/activity to make %cs far more useful
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29944 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine/skin_tokens.c')
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 3aa7947edc..3c6a817ea8 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -1730,37 +1730,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1730 | 1730 | ||
1731 | case SKIN_TOKEN_CURRENT_SCREEN: | 1731 | case SKIN_TOKEN_CURRENT_SCREEN: |
1732 | { | 1732 | { |
1733 | int curr_screen = current_screen(); | 1733 | int curr_screen = get_current_activity(); |
1734 | |||
1735 | #ifdef HAVE_RECORDING | ||
1736 | /* override current_screen() for recording screen since it may | ||
1737 | * be entered from the radio screen */ | ||
1738 | if (in_recording_screen()) | ||
1739 | curr_screen = GO_TO_RECSCREEN; | ||
1740 | #endif | ||
1741 | |||
1742 | switch (curr_screen) | ||
1743 | { | ||
1744 | case GO_TO_WPS: | ||
1745 | curr_screen = 2; | ||
1746 | break; | ||
1747 | #ifdef HAVE_RECORDING | ||
1748 | case GO_TO_RECSCREEN: | ||
1749 | curr_screen = 3; | ||
1750 | break; | ||
1751 | #endif | ||
1752 | #if CONFIG_TUNER | ||
1753 | case GO_TO_FM: | ||
1754 | curr_screen = 4; | ||
1755 | break; | ||
1756 | #endif | ||
1757 | case GO_TO_PLAYLIST_VIEWER: | ||
1758 | curr_screen = 5; | ||
1759 | break; | ||
1760 | default: /* lists */ | ||
1761 | curr_screen = 1; | ||
1762 | break; | ||
1763 | } | ||
1764 | if (intval) | 1734 | if (intval) |
1765 | { | 1735 | { |
1766 | *intval = curr_screen; | 1736 | *intval = curr_screen; |