summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-03-06 15:21:58 +0000
committerThomas Martitz <kugel@rockbox.org>2009-03-06 15:21:58 +0000
commit2b6e4adbd2cd2880e4d94d9519361617bfe8e755 (patch)
tree49bd5355328abdb6bbe1103d95de199a23dcadd5
parent6f030a01c97063b4ec0e1c30a62016cbfd8eea05 (diff)
downloadrockbox-2b6e4adbd2cd2880e4d94d9519361617bfe8e755.zip
rockbox-2b6e4adbd2cd2880e4d94d9519361617bfe8e755.tar.gz
rockbox-2b6e4adbd2cd2880e4d94d9519361617bfe8e755.tar.bz2
rockbox-2b6e4adbd2cd2880e4d94d9519361617bfe8e755.tar.xz
Fix FS#9977 - Thanks to Brian Sutherland for intensive testing and effort
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20214 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/tagcache.c6
-rw-r--r--apps/tagcache.h2
-rw-r--r--docs/CREDITS2
3 files changed, 5 insertions, 5 deletions
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 8e14b9f..e7f3294 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -166,8 +166,8 @@ static struct mutex command_queue_mutex;
/* Variable-length tag entry in tag files. */
struct tagfile_entry {
- short tag_length; /* Length of the data in bytes including '\0' */
- short idx_id; /* Corresponding entry location in index file of not unique tags */
+ int32_t tag_length; /* Length of the data in bytes including '\0' */
+ int32_t idx_id; /* Corresponding entry location in index file of not unique tags */
char tag_data[0]; /* Begin of the tag data */
};
@@ -192,7 +192,7 @@ struct master_header {
};
/* For the endianess correction */
-static const char *tagfile_entry_ec = "ss";
+static const char *tagfile_entry_ec = "ll";
/**
Note: This should be (1 + TAG_COUNT) amount of l's.
*/
diff --git a/apps/tagcache.h b/apps/tagcache.h
index c69e28f..e995784 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -49,7 +49,7 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
#define IDX_BUF_DEPTH 64
/* Tag Cache Header version 'TCHxx'. Increment when changing internal structures. */
-#define TAGCACHE_MAGIC 0x5443480c
+#define TAGCACHE_MAGIC 0x5443480d
/* How much to allocate extra space for ramcache. */
#define TAGCACHE_RESERVE 32768
diff --git a/docs/CREDITS b/docs/CREDITS
index 4f7a7f5..39d1a23 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -452,7 +452,7 @@ Joshua Simmons
Sei Aoyumi
Martin Pool
Gareth Schakel
-
+Brian Sutherland
The libmad team
The wavpack team