aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins/wavpack_plugin.c
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-09-03 03:11:58 -0700
committerEric Wong <normalperson@yhbt.net>2008-09-03 03:14:17 -0700
commit3f29cbaf360c5e9542c7b9e6648626d6e0ea8b1e (patch)
tree49dd735d55dd8d5964c4273998a2f3fc454534bb /src/inputPlugins/wavpack_plugin.c
parent86d4a80b0069b2be368bfe4af164be5ff72a48b4 (diff)
parentcdc9bb460e9536577d2747d51c76306a91b3d064 (diff)
downloadmpd-3f29cbaf360c5e9542c7b9e6648626d6e0ea8b1e.tar.gz
mpd-3f29cbaf360c5e9542c7b9e6648626d6e0ea8b1e.tar.xz
mpd-3f29cbaf360c5e9542c7b9e6648626d6e0ea8b1e.zip
Merge branch 'mk/tag'
* mk/tag: (22 commits) tag: fix segfault on update utf8.h: Fix build (broken os_compat.h #include) tag: optimize tag_dup(), copy item references tag: fix the shout and oggflac plugins const pointers tag: static directory name tag: try not to reallocate tag.items in every add() call song: don't export newNullSong() tag: try not to duplicate the input string tag: pass length to fix_utf8() added "length" parameter to validUtf8String() assert value!=NULL in fix_utf8() tag: converted macro fixUtf8() to an inline function tag: added a pool for tag items tag: converted tag_item.value to a char array removed tree.c tag: converted MpdTag.items to a pointer list tag: moved code to tag_id3.c wavpack: tag_new() cannot fail tag: converted tag_add_item() to an inline function ...
Diffstat (limited to '')
-rw-r--r--src/inputPlugins/wavpack_plugin.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index c7e024a41..77339dabd 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -270,10 +270,10 @@ static ReplayGainInfo *wavpack_replaygain(WavpackContext *wpc)
/*
* Reads metainfo from the specified file.
*/
-static MpdTag *wavpack_tagdup(char *fname)
+static struct mpd_tag *wavpack_tagdup(char *fname)
{
WavpackContext *wpc;
- MpdTag *tag;
+ struct mpd_tag *tag;
char error[ERRORLEN];
char *s;
int ssize;
@@ -285,12 +285,7 @@ static MpdTag *wavpack_tagdup(char *fname)
return NULL;
}
- tag = newMpdTag();
- if (tag == NULL) {
- ERROR("failed to newMpdTag()\n");
- return NULL;
- }
-
+ tag = tag_new();
tag->time =
(float)WavpackGetNumSamples(wpc) / WavpackGetSampleRate(wpc);
@@ -314,7 +309,7 @@ static MpdTag *wavpack_tagdup(char *fname)
}
WavpackGetTagItem(wpc, tagtypes[i].name, s, j);
- addItemToMpdTag(tag, tagtypes[i].type, s);
+ tag_add_item(tag, tagtypes[i].type, s);
}
}