nihilazo/rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

r23208 broke conditional use of metadata and filename tags. Return NULL instead of "n/a" to make it work again.

Browse Source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23253 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2009-10-18 23:58:42 +00:00
parent 3cc5345bc5
commit c26949c54b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/gui/skin_engine/skin_tokens.c
View File

@ -123,7 +123,7 @@ static char* get_dir(char* buf, int buf_size, const char* path, int level)
/* a few convinience macros for the id3 == NULL case
* depends on a few variable names in get_token_value() */
#define HANDLE_NULL_ID3(id3field) (LIKELY(id3) ? (id3field) : na_str)
#define HANDLE_NULL_ID3(id3field) (LIKELY(id3) ? (id3field) : NULL)
#define HANDLE_NULL_ID3_NUM_ZERO { if (UNLIKELY(!id3)) return zero_str; }
@ -151,7 +151,6 @@ const char *get_token_value(struct gui_wps *gwps,
struct wps_data *data = gwps->data;
struct wps_state *state = gwps->state;
int elapsed, length;
static const char * const na_str = "n/a";
static const char * const zero_str = "0";
if (!data || !state)
@ -418,8 +417,7 @@ const char *get_token_value(struct gui_wps *gwps,
return buf;
case WPS_TOKEN_FILE_NAME:
if (!id3) return na_str;
if (get_dir(buf, buf_size, id3->path, 0)) {
if (LIKELY(id3) && get_dir(buf, buf_size, id3->path, 0)) {
/* Remove extension */
char* sep = strrchr(buf, '.');
if (NULL != sep) {
@ -432,8 +430,9 @@ const char *get_token_value(struct gui_wps *gwps,
}
case WPS_TOKEN_FILE_NAME_WITH_EXTENSION:
if (!id3) return na_str;
return get_dir(buf, buf_size, id3->path, 0);
if (LIKELY(id3))
return get_dir(buf, buf_size, id3->path, 0);
return NULL;
case WPS_TOKEN_FILE_PATH:
return HANDLE_NULL_ID3(id3->path);
@ -449,7 +448,7 @@ const char *get_token_value(struct gui_wps *gwps,
case WPS_TOKEN_FILE_DIRECTORY:
if (LIKELY(id3))
return get_dir(buf, buf_size, id3->path, token->value.i);
return na_str;
return NULL;
case WPS_TOKEN_BATTERY_PERCENT:
{