oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/wavpack: use the tag_table library

Browse Source
This commit is contained in:
Max Kellermann 2012-02-11 19:34:10 +01:00
parent ee16fc958c
commit 29bf3d2c04
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/decoder/wavpack_decoder_plugin.c
View File

@ -22,6 +22,7 @@
#include "audio_check.h" #include "audio_check.h"
#include "path.h" #include "path.h"
#include "utils.h" #include "utils.h"
#include "tag_table.h"
#include "tag_handler.h" #include "tag_handler.h"
#include <wavpack/wavpack.h> #include <wavpack/wavpack.h>
@ -37,10 +38,7 @@
#define ERRORLEN 80 #define ERRORLEN 80
static struct { static const struct tag_table wavpack_tags[] = {
const char *name;
enum tag_type type;
} tagtypes[] = {
{ "artist", TAG_ARTIST }, { "artist", TAG_ARTIST },
{ "album", TAG_ALBUM }, { "album", TAG_ALBUM },
{ "title", TAG_TITLE }, { "title", TAG_TITLE },
@ -52,6 +50,7 @@ static struct {
{ "performer", TAG_PERFORMER }, { "performer", TAG_PERFORMER },
{ "comment", TAG_COMMENT }, { "comment", TAG_COMMENT },
{ "disc", TAG_DISC }, { "disc", TAG_DISC },
{ NULL, TAG_NUM_OF_ITEM_TYPES }
}; };
/** A pointer type for format converter function. */ /** A pointer type for format converter function. */
@ -301,8 +300,8 @@ wavpack_scan_file(const char *fname,
allocated_size = 0; allocated_size = 0;
s = NULL; s = NULL;
for (unsigned i = 0; i < G_N_ELEMENTS(tagtypes); ++i) { for (const struct tag_table *i = wavpack_tags; i->name != NULL; ++i) {
size = WavpackGetTagItem(wpc, tagtypes[i].name, NULL, 0); size = WavpackGetTagItem(wpc, i->name, NULL, 0);
if (size > 0) { if (size > 0) {
++size; /* EOS */ ++size; /* EOS */
@ -315,9 +314,9 @@ wavpack_scan_file(const char *fname,
s = t; s = t;
} }
WavpackGetTagItem(wpc, tagtypes[i].name, s, size); WavpackGetTagItem(wpc, i->name, s, size);
tag_handler_invoke_tag(handler, handler_ctx, tag_handler_invoke_tag(handler, handler_ctx,
tagtypes[i].type, s); i->type, s);
} }
} }