diff options
Diffstat (limited to 'apps/metadata')
-rw-r--r-- | apps/metadata/asap.c | 3 | ||||
-rw-r--r-- | apps/metadata/metadata_parsers.h | 3 | ||||
-rw-r--r-- | apps/metadata/monkeys.c | 2 | ||||
-rw-r--r-- | apps/metadata/mp3.c | 8 | ||||
-rw-r--r-- | apps/metadata/mpc.c | 2 | ||||
-rw-r--r-- | apps/metadata/spc.c | 3 | ||||
-rw-r--r-- | apps/metadata/wavpack.c | 1 |
7 files changed, 12 insertions, 10 deletions
diff --git a/apps/metadata/asap.c b/apps/metadata/asap.c index 0472798462..9e7f227031 100644 --- a/apps/metadata/asap.c +++ b/apps/metadata/asap.c | |||
@@ -248,6 +248,7 @@ bool get_asap_metadata(int fd, struct mp3entry* id3) | |||
248 | 248 | ||
249 | id3->vbr = false; | 249 | id3->vbr = false; |
250 | id3->filesize = filelength; | 250 | id3->filesize = filelength; |
251 | 251 | id3->genre_string = id3_get_num_genre(36); | |
252 | |||
252 | return true; | 253 | return true; |
253 | } | 254 | } |
diff --git a/apps/metadata/metadata_parsers.h b/apps/metadata/metadata_parsers.h index 7238b71a30..7797b47094 100644 --- a/apps/metadata/metadata_parsers.h +++ b/apps/metadata/metadata_parsers.h | |||
@@ -23,8 +23,7 @@ char* id3_get_num_genre(unsigned int genre_num); | |||
23 | int getid3v2len(int fd); | 23 | int getid3v2len(int fd); |
24 | bool setid3v1title(int fd, struct mp3entry *entry); | 24 | bool setid3v1title(int fd, struct mp3entry *entry); |
25 | void setid3v2title(int fd, struct mp3entry *entry); | 25 | void setid3v2title(int fd, struct mp3entry *entry); |
26 | bool get_mp3_metadata(int fd, struct mp3entry* id3, const char *filename); | 26 | bool get_mp3_metadata(int fd, struct mp3entry* id3); |
27 | |||
28 | bool get_adx_metadata(int fd, struct mp3entry* id3); | 27 | bool get_adx_metadata(int fd, struct mp3entry* id3); |
29 | bool get_aiff_metadata(int fd, struct mp3entry* id3); | 28 | bool get_aiff_metadata(int fd, struct mp3entry* id3); |
30 | bool get_flac_metadata(int fd, struct mp3entry* id3); | 29 | bool get_flac_metadata(int fd, struct mp3entry* id3); |
diff --git a/apps/metadata/monkeys.c b/apps/metadata/monkeys.c index 1cacff13af..4aff1412aa 100644 --- a/apps/metadata/monkeys.c +++ b/apps/metadata/monkeys.c | |||
@@ -91,5 +91,7 @@ bool get_monkeys_metadata(int fd, struct mp3entry* id3) | |||
91 | 91 | ||
92 | id3->length = ((int64_t) totalsamples * 1000) / id3->frequency; | 92 | id3->length = ((int64_t) totalsamples * 1000) / id3->frequency; |
93 | id3->bitrate = (id3->filesize * 8) / id3->length; | 93 | id3->bitrate = (id3->filesize * 8) / id3->length; |
94 | |||
95 | read_ape_tags(fd, id3); | ||
94 | return true; | 96 | return true; |
95 | } | 97 | } |
diff --git a/apps/metadata/mp3.c b/apps/metadata/mp3.c index c65fb39cd8..9309242604 100644 --- a/apps/metadata/mp3.c +++ b/apps/metadata/mp3.c | |||
@@ -163,14 +163,8 @@ static int getsonglength(int fd, struct mp3entry *entry) | |||
163 | * about an MP3 file and updates it's entry accordingly. | 163 | * about an MP3 file and updates it's entry accordingly. |
164 | * | 164 | * |
165 | Note, that this returns true for successful, false for error! */ | 165 | Note, that this returns true for successful, false for error! */ |
166 | bool get_mp3_metadata(int fd, struct mp3entry *entry, const char *filename) | 166 | bool get_mp3_metadata(int fd, struct mp3entry *entry) |
167 | { | 167 | { |
168 | #if CONFIG_CODEC != SWCODEC | ||
169 | memset(entry, 0, sizeof(struct mp3entry)); | ||
170 | #endif | ||
171 | |||
172 | strlcpy(entry->path, filename, sizeof(entry->path)); | ||
173 | |||
174 | entry->title = NULL; | 168 | entry->title = NULL; |
175 | entry->filesize = filesize(fd); | 169 | entry->filesize = filesize(fd); |
176 | entry->id3v2len = getid3v2len(fd); | 170 | entry->id3v2len = getid3v2len(fd); |
diff --git a/apps/metadata/mpc.c b/apps/metadata/mpc.c index c6f3c3df72..f70e1d35df 100644 --- a/apps/metadata/mpc.c +++ b/apps/metadata/mpc.c | |||
@@ -211,5 +211,7 @@ bool get_musepack_metadata(int fd, struct mp3entry *id3) | |||
211 | 211 | ||
212 | id3->filesize = filesize(fd); | 212 | id3->filesize = filesize(fd); |
213 | id3->bitrate = id3->filesize * 8 / id3->length; | 213 | id3->bitrate = id3->filesize * 8 / id3->length; |
214 | |||
215 | read_ape_tags(fd, id3); | ||
214 | return true; | 216 | return true; |
215 | } | 217 | } |
diff --git a/apps/metadata/spc.c b/apps/metadata/spc.c index 786c678c4c..f1fcb81707 100644 --- a/apps/metadata/spc.c +++ b/apps/metadata/spc.c | |||
@@ -124,5 +124,8 @@ bool get_spc_metadata(int fd, struct mp3entry* id3) | |||
124 | 124 | ||
125 | id3->length = length+fade; | 125 | id3->length = length+fade; |
126 | 126 | ||
127 | id3->filesize = filesize(fd); | ||
128 | id3->genre_string = id3_get_num_genre(36); | ||
129 | |||
127 | return true; | 130 | return true; |
128 | } | 131 | } |
diff --git a/apps/metadata/wavpack.c b/apps/metadata/wavpack.c index a6ab6f2bd5..bb181b8d3f 100644 --- a/apps/metadata/wavpack.c +++ b/apps/metadata/wavpack.c | |||
@@ -136,6 +136,7 @@ bool get_wavpack_metadata(int fd, struct mp3entry* id3) | |||
136 | id3->length = ((int64_t) totalsamples * 1000) / id3->frequency; | 136 | id3->length = ((int64_t) totalsamples * 1000) / id3->frequency; |
137 | id3->bitrate = filesize (fd) / (id3->length / 8); | 137 | id3->bitrate = filesize (fd) / (id3->length / 8); |
138 | 138 | ||
139 | read_ape_tags(fd, id3); | ||
139 | return true; | 140 | return true; |
140 | } | 141 | } |
141 | 142 | ||