diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rbcodec/metadata/id3tags.c | 2 | ||||
-rw-r--r-- | lib/rbcodec/metadata/metadata.c | 6 | ||||
-rw-r--r-- | lib/rbcodec/metadata/metadata.h | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/lib/rbcodec/metadata/id3tags.c b/lib/rbcodec/metadata/id3tags.c index ba7695d569..1e792d9122 100644 --- a/lib/rbcodec/metadata/id3tags.c +++ b/lib/rbcodec/metadata/id3tags.c | |||
@@ -1200,7 +1200,7 @@ int main(int argc, char **argv) | |||
1200 | for(i=1; i<argc; i++) { | 1200 | for(i=1; i<argc; i++) { |
1201 | struct mp3entry mp3; | 1201 | struct mp3entry mp3; |
1202 | mp3.album = "Bogus"; | 1202 | mp3.album = "Bogus"; |
1203 | if(mp3info(&mp3, argv[i], false)) { | 1203 | if(!get_metadata(&mp3, -1, argv[i])) { |
1204 | printf("Failed to get %s\n", argv[i]); | 1204 | printf("Failed to get %s\n", argv[i]); |
1205 | return 0; | 1205 | return 0; |
1206 | } | 1206 | } |
diff --git a/lib/rbcodec/metadata/metadata.c b/lib/rbcodec/metadata/metadata.c index 670c37fcfd..70179daa2f 100644 --- a/lib/rbcodec/metadata/metadata.c +++ b/lib/rbcodec/metadata/metadata.c | |||
@@ -399,12 +399,6 @@ unsigned int probe_file_format(const char *filename) | |||
399 | return AFMT_UNKNOWN; | 399 | return AFMT_UNKNOWN; |
400 | } | 400 | } |
401 | 401 | ||
402 | /* Note, that this returns false for successful, true for error! */ | ||
403 | bool mp3info(struct mp3entry *entry, const char *filename) | ||
404 | { | ||
405 | return !get_metadata(entry, -1, filename); | ||
406 | } | ||
407 | |||
408 | /* Get metadata for track - return false if parsing showed problems with the | 402 | /* Get metadata for track - return false if parsing showed problems with the |
409 | * file that would prevent playback. supply a filedescriptor <0 and the file will be opened | 403 | * file that would prevent playback. supply a filedescriptor <0 and the file will be opened |
410 | * and closed automatically within the get_metadata call | 404 | * and closed automatically within the get_metadata call |
diff --git a/lib/rbcodec/metadata/metadata.h b/lib/rbcodec/metadata/metadata.h index ce1b153833..8a379ad396 100644 --- a/lib/rbcodec/metadata/metadata.h +++ b/lib/rbcodec/metadata/metadata.h | |||
@@ -326,7 +326,6 @@ struct mp3entry { | |||
326 | unsigned int probe_file_format(const char *filename); | 326 | unsigned int probe_file_format(const char *filename); |
327 | bool get_metadata(struct mp3entry* id3, int fd, const char* trackname); | 327 | bool get_metadata(struct mp3entry* id3, int fd, const char* trackname); |
328 | bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int flags); | 328 | bool get_metadata_ex(struct mp3entry* id3, int fd, const char* trackname, int flags); |
329 | bool mp3info(struct mp3entry *entry, const char *filename); | ||
330 | void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig); | 329 | void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig); |
331 | void copy_mp3entry(struct mp3entry *dest, const struct mp3entry *orig); | 330 | void copy_mp3entry(struct mp3entry *dest, const struct mp3entry *orig); |
332 | void wipe_mp3entry(struct mp3entry *id3); | 331 | void wipe_mp3entry(struct mp3entry *id3); |