From b58d3656d79e5f9752a22d55c139294412084e4f Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 1 Jun 2011 14:41:49 +0000 Subject: 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 --- apps/gui/skin_engine/skin_tokens.c | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) (limited to 'apps/gui/skin_engine/skin_tokens.c') 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, case SKIN_TOKEN_CURRENT_SCREEN: { - int curr_screen = current_screen(); - -#ifdef HAVE_RECORDING - /* override current_screen() for recording screen since it may - * be entered from the radio screen */ - if (in_recording_screen()) - curr_screen = GO_TO_RECSCREEN; -#endif - - switch (curr_screen) - { - case GO_TO_WPS: - curr_screen = 2; - break; -#ifdef HAVE_RECORDING - case GO_TO_RECSCREEN: - curr_screen = 3; - break; -#endif -#if CONFIG_TUNER - case GO_TO_FM: - curr_screen = 4; - break; -#endif - case GO_TO_PLAYLIST_VIEWER: - curr_screen = 5; - break; - default: /* lists */ - curr_screen = 1; - break; - } + int curr_screen = get_current_activity(); if (intval) { *intval = curr_screen; -- cgit v1.2.3