diff options
author | Robert Kukla <roolku@rockbox.org> | 2007-03-04 17:30:12 +0000 |
---|---|---|
committer | Robert Kukla <roolku@rockbox.org> | 2007-03-04 17:30:12 +0000 |
commit | 28530bc61a74af279dc60550985f5c4c613cee6f (patch) | |
tree | 4d63d7751701be8a7606206937936d6fcfe10516 /apps/tagcache.c | |
parent | c306b2a9a6f94a3a99703a36cf78fde8dd4527f7 (diff) | |
download | rockbox-28530bc61a74af279dc60550985f5c4c613cee6f.tar.gz rockbox-28530bc61a74af279dc60550985f5c4c613cee6f.zip |
don't display "<Untagged>" (tagcache place holder for empty string) in wps
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12595 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tagcache.c')
-rw-r--r-- | apps/tagcache.c | 39 |
1 files changed, 30 insertions, 9 deletions
diff --git a/apps/tagcache.c b/apps/tagcache.c index 46614ef5df..884697f4b1 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -91,6 +91,8 @@ static long tagcache_stack[(DEFAULT_STACK_SIZE + 0x4000)/sizeof(long)]; | |||
91 | static const char tagcache_thread_name[] = "tagcache"; | 91 | static const char tagcache_thread_name[] = "tagcache"; |
92 | #endif | 92 | #endif |
93 | 93 | ||
94 | #define UNTAGGED "<Untagged>" | ||
95 | |||
94 | /* Previous path when scanning directory tree recursively. */ | 96 | /* Previous path when scanning directory tree recursively. */ |
95 | static char curpath[TAG_MAXLEN+32]; | 97 | static char curpath[TAG_MAXLEN+32]; |
96 | static long curpath_size = sizeof(curpath); | 98 | static long curpath_size = sizeof(curpath); |
@@ -1460,6 +1462,7 @@ bool tagcache_fill_tags(struct mp3entry *id3, const char *filename) | |||
1460 | { | 1462 | { |
1461 | struct index_entry *entry; | 1463 | struct index_entry *entry; |
1462 | int idx_id; | 1464 | int idx_id; |
1465 | char *tmp; | ||
1463 | 1466 | ||
1464 | if (!tc_stat.ready) | 1467 | if (!tc_stat.ready) |
1465 | return false; | 1468 | return false; |
@@ -1471,14 +1474,32 @@ bool tagcache_fill_tags(struct mp3entry *id3, const char *filename) | |||
1471 | 1474 | ||
1472 | entry = &hdr->indices[idx_id]; | 1475 | entry = &hdr->indices[idx_id]; |
1473 | 1476 | ||
1474 | id3->title = get_tag(entry, tag_title)->tag_data; | 1477 | tmp = get_tag(entry, tag_title)->tag_data; |
1475 | id3->artist = get_tag(entry, tag_artist)->tag_data; | 1478 | id3->title = strcmp(tmp, UNTAGGED) ? tmp : NULL; |
1476 | id3->album = get_tag(entry, tag_album)->tag_data; | 1479 | |
1477 | id3->genre_string = get_tag(entry, tag_genre)->tag_data; | 1480 | tmp = get_tag(entry, tag_artist)->tag_data; |
1478 | id3->composer = get_tag(entry, tag_composer)->tag_data; | 1481 | id3->artist = strcmp(tmp, UNTAGGED) ? tmp : NULL; |
1479 | id3->comment = get_tag(entry, tag_comment)->tag_data; | 1482 | |
1480 | id3->albumartist = get_tag(entry, tag_albumartist)->tag_data; | 1483 | tmp = get_tag(entry, tag_album)->tag_data; |
1481 | id3->year = get_tag_numeric(entry, tag_year); | 1484 | id3->album = strcmp(tmp, UNTAGGED) ? tmp : NULL; |
1485 | |||
1486 | tmp = get_tag(entry, tag_genre)->tag_data; | ||
1487 | id3->genre_string = strcmp(tmp, UNTAGGED) ? tmp : NULL; | ||
1488 | |||
1489 | tmp = get_tag(entry, tag_composer)->tag_data; | ||
1490 | id3->composer = strcmp(tmp, UNTAGGED) ? tmp : NULL; | ||
1491 | |||
1492 | tmp = get_tag(entry, tag_comment)->tag_data; | ||
1493 | id3->comment = strcmp(tmp, UNTAGGED) ? tmp : NULL; | ||
1494 | |||
1495 | tmp = get_tag(entry, tag_albumartist)->tag_data; | ||
1496 | id3->albumartist = strcmp(tmp, UNTAGGED) ? tmp : NULL; | ||
1497 | |||
1498 | id3->playcount = get_tag_numeric(entry, tag_playcount); | ||
1499 | id3->lastplayed = get_tag_numeric(entry, tag_lastplayed); | ||
1500 | id3->rating = get_tag_numeric(entry, tag_virt_autoscore) / 10; | ||
1501 | id3->year = get_tag_numeric(entry, tag_year); | ||
1502 | |||
1482 | id3->tracknum = get_tag_numeric(entry, tag_tracknumber); | 1503 | id3->tracknum = get_tag_numeric(entry, tag_tracknumber); |
1483 | id3->bitrate = get_tag_numeric(entry, tag_bitrate); | 1504 | id3->bitrate = get_tag_numeric(entry, tag_bitrate); |
1484 | if (id3->bitrate == 0) | 1505 | if (id3->bitrate == 0) |
@@ -1502,7 +1523,7 @@ static int check_if_empty(char **tag) | |||
1502 | 1523 | ||
1503 | if (*tag == NULL || *tag[0] == '\0') | 1524 | if (*tag == NULL || *tag[0] == '\0') |
1504 | { | 1525 | { |
1505 | *tag = "<Untagged>"; | 1526 | *tag = UNTAGGED; |
1506 | return 11; /* Tag length */ | 1527 | return 11; /* Tag length */ |
1507 | } | 1528 | } |
1508 | 1529 | ||