aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/inputPlugins')
-rw-r--r--src/inputPlugins/_flac_common.c6
-rw-r--r--src/inputPlugins/aac_plugin.c4
-rw-r--r--src/inputPlugins/audiofile_plugin.c2
-rw-r--r--src/inputPlugins/flac_plugin.c8
-rw-r--r--src/inputPlugins/mod_plugin.c4
-rw-r--r--src/inputPlugins/mp3_plugin.c35
-rw-r--r--src/inputPlugins/mp4_plugin.c22
-rw-r--r--src/inputPlugins/mpc_plugin.c6
-rw-r--r--src/inputPlugins/oggvorbis_plugin.c12
-rw-r--r--src/inputPlugins/wavpack_plugin.c6
10 files changed, 52 insertions, 53 deletions
diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c
index 6307af00d..9950f75db 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/inputPlugins/_flac_common.c
@@ -123,10 +123,10 @@ static unsigned int commentMatchesAddToTag(const
if ((vlen > 0) && (0 == strncasecmp(str, (char *)entry->entry, slen))
&& (*(entry->entry + slen) == '=')) {
if (!*tag)
- *tag = newMpdTag();
+ *tag = tag_new();
- addItemToMpdTagWithLen(*tag, itemType,
- (char *)(entry->entry + slen + 1), vlen);
+ tag_add_item_n(*tag, itemType,
+ (char *)(entry->entry + slen + 1), vlen);
return 1;
}
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index 161b1b9b8..dc97c1e08 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -559,8 +559,8 @@ static struct mpd_tag *aacTagDup(char *file)
int file_time = getAacTotalTime(file);
if (file_time >= 0) {
- if ((ret = id3Dup(file)) == NULL)
- ret = newMpdTag();
+ if ((ret = tag_id3_load(file)) == NULL)
+ ret = tag_new();
ret->time = file_time;
} else {
DEBUG("aacTagDup: Failed to get total song time from: %s\n",
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c
index ce8eb68d4..6fcc98239 100644
--- a/src/inputPlugins/audiofile_plugin.c
+++ b/src/inputPlugins/audiofile_plugin.c
@@ -123,7 +123,7 @@ static struct mpd_tag *audiofileTagDup(char *file)
if (total_time >= 0) {
if (!ret)
- ret = newMpdTag();
+ ret = tag_new();
ret->time = total_time;
} else {
DEBUG
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index c376497a9..89e988a03 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -338,7 +338,7 @@ static struct mpd_tag *flacMetadataDup(char *file, int *vorbisCommentFound)
*vorbisCommentFound = 1;
} else if (block->type == FLAC__METADATA_TYPE_STREAMINFO) {
if (!ret)
- ret = newMpdTag();
+ ret = tag_new();
ret->time = ((float)block->data.stream_info.
total_samples) /
block->data.stream_info.sample_rate + 0.5;
@@ -362,10 +362,10 @@ static struct mpd_tag *flacTagDup(char *file)
return NULL;
}
if (!foundVorbisComment) {
- struct mpd_tag *temp = id3Dup(file);
+ struct mpd_tag *temp = tag_id3_load(file);
if (temp) {
temp->time = ret->time;
- freeMpdTag(ret);
+ tag_free(ret);
ret = temp;
}
}
@@ -484,7 +484,7 @@ static struct mpd_tag *oggflac_tag_dup(char *file)
ret = copyVorbisCommentBlockToMpdTag(block, ret);
} else if (block->type == FLAC__METADATA_TYPE_STREAMINFO) {
if (!ret)
- ret = newMpdTag();
+ ret = tag_new();
ret->time = ((float)block->data.stream_info.
total_samples) /
block->data.stream_info.sample_rate + 0.5;
diff --git a/src/inputPlugins/mod_plugin.c b/src/inputPlugins/mod_plugin.c
index c954f064d..586d87ae9 100644
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/inputPlugins/mod_plugin.c
@@ -224,12 +224,12 @@ static struct mpd_tag *modTagDup(char *file)
}
Player_Free(moduleHandle);
- ret = newMpdTag();
+ ret = tag_new();
ret->time = 0;
title = xstrdup(Player_LoadTitle(file));
if (title)
- addItemToMpdTag(ret, TAG_ITEM_TITLE, title);
+ tag_add_item(ret, TAG_ITEM_TITLE, title);
MikMod_Exit();
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 9644e7a62..ff3de80a3 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -348,10 +348,10 @@ static void mp3_parseId3Tag(mp3DecodeData * data, size_t tagsize,
goto fail;
if (mpdTag) {
- tmpMpdTag = parseId3Tag(id3Tag);
+ tmpMpdTag = tag_id3_import(id3Tag);
if (tmpMpdTag) {
if (*mpdTag)
- freeMpdTag(*mpdTag);
+ tag_free(*mpdTag);
*mpdTag = tmpMpdTag;
}
}
@@ -819,7 +819,7 @@ static int openMp3FromInputStream(InputStream * inStream, mp3DecodeData * data,
if (decodeFirstFrame(data, tag, replayGainInfo) < 0) {
mp3DecodeDataFinalize(data);
if (tag && *tag)
- freeMpdTag(*tag);
+ tag_free(*tag);
return -1;
}
@@ -923,13 +923,12 @@ mp3Read(mp3DecodeData * data, ReplayGainInfo ** replayGainInfo)
}
if (data->inStream->metaTitle) {
- struct mpd_tag *tag = newMpdTag();
+ struct mpd_tag *tag = tag_new();
if (data->inStream->metaName) {
- addItemToMpdTag(tag,
- TAG_ITEM_NAME,
- data->inStream->metaName);
+ tag_add_item(tag, TAG_ITEM_NAME,
+ data->inStream->metaName);
}
- addItemToMpdTag(tag, TAG_ITEM_TITLE,
+ tag_add_item(tag, TAG_ITEM_TITLE,
data->inStream->metaTitle);
free(data->inStream->metaTitle);
data->inStream->metaTitle = NULL;
@@ -1051,23 +1050,23 @@ static int mp3_decode(InputStream * inStream)
if (inStream->metaTitle) {
if (tag)
- freeMpdTag(tag);
- tag = newMpdTag();
- addItemToMpdTag(tag, TAG_ITEM_TITLE, inStream->metaTitle);
+ tag_free(tag);
+ tag = tag_new();
+ tag_add_item(tag, TAG_ITEM_TITLE, inStream->metaTitle);
free(inStream->metaTitle);
inStream->metaTitle = NULL;
if (inStream->metaName) {
- addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName);
+ tag_add_item(tag, TAG_ITEM_NAME, inStream->metaName);
}
} else if (tag) {
if (inStream->metaName) {
- clearItemsFromMpdTag(tag, TAG_ITEM_NAME);
- addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName);
+ tag_clear_items_by_type(tag, TAG_ITEM_NAME);
+ tag_add_item(tag, TAG_ITEM_NAME, inStream->metaName);
}
} else if (inStream->metaName) {
- tag = newMpdTag();
+ tag = tag_new();
if (inStream->metaName) {
- addItemToMpdTag(tag, TAG_ITEM_NAME, inStream->metaName);
+ tag_add_item(tag, TAG_ITEM_NAME, inStream->metaName);
}
}
if (tag)
@@ -1086,13 +1085,13 @@ static struct mpd_tag *mp3_tagDup(char *file)
struct mpd_tag *ret = NULL;
int total_time;
- ret = id3Dup(file);
+ ret = tag_id3_load(file);
total_time = getMp3TotalTime(file);
if (total_time >= 0) {
if (!ret)
- ret = newMpdTag();
+ ret = tag_new();
ret->time = total_time;
} else {
DEBUG("mp3_tagDup: Failed to get total song time from: %s\n",
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index 543ff76b7..cc2b89efc 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -322,14 +322,14 @@ static struct mpd_tag *mp4DataDup(char *file, int *mp4MetadataFound)
return NULL;
}
- ret = newMpdTag();
+ ret = tag_new();
file_time = mp4ff_get_track_duration_use_offsets(mp4fh, track);
scale = mp4ff_time_scale(mp4fh, track);
if (scale < 0) {
mp4ff_close(mp4fh);
closeInputStream(&inStream);
free(callback);
- freeMpdTag(ret);
+ tag_free(ret);
return NULL;
}
ret->time = ((float)file_time) / scale + 0.5;
@@ -341,25 +341,25 @@ static struct mpd_tag *mp4DataDup(char *file, int *mp4MetadataFound)
mp4ff_meta_get_by_index(mp4fh, i, &item, &value);
if (0 == strcasecmp("artist", item)) {
- addItemToMpdTag(ret, TAG_ITEM_ARTIST, value);
+ tag_add_item(ret, TAG_ITEM_ARTIST, value);
*mp4MetadataFound = 1;
} else if (0 == strcasecmp("title", item)) {
- addItemToMpdTag(ret, TAG_ITEM_TITLE, value);
+ tag_add_item(ret, TAG_ITEM_TITLE, value);
*mp4MetadataFound = 1;
} else if (0 == strcasecmp("album", item)) {
- addItemToMpdTag(ret, TAG_ITEM_ALBUM, value);
+ tag_add_item(ret, TAG_ITEM_ALBUM, value);
*mp4MetadataFound = 1;
} else if (0 == strcasecmp("track", item)) {
- addItemToMpdTag(ret, TAG_ITEM_TRACK, value);
+ tag_add_item(ret, TAG_ITEM_TRACK, value);
*mp4MetadataFound = 1;
} else if (0 == strcasecmp("disc", item)) { /* Is that the correct id? */
- addItemToMpdTag(ret, TAG_ITEM_DISC, value);
+ tag_add_item(ret, TAG_ITEM_DISC, value);
*mp4MetadataFound = 1;
} else if (0 == strcasecmp("genre", item)) {
- addItemToMpdTag(ret, TAG_ITEM_GENRE, value);
+ tag_add_item(ret, TAG_ITEM_GENRE, value);
*mp4MetadataFound = 1;
} else if (0 == strcasecmp("date", item)) {
- addItemToMpdTag(ret, TAG_ITEM_DATE, value);
+ tag_add_item(ret, TAG_ITEM_DATE, value);
*mp4MetadataFound = 1;
}
@@ -382,10 +382,10 @@ static struct mpd_tag *mp4TagDup(char *file)
if (!ret)
return NULL;
if (!mp4MetadataFound) {
- struct mpd_tag *temp = id3Dup(file);
+ struct mpd_tag *temp = tag_id3_load(file);
if (temp) {
temp->time = ret->time;
- freeMpdTag(ret);
+ tag_free(ret);
ret = temp;
}
}
diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c
index e3e16e8b3..e5502a2f0 100644
--- a/src/inputPlugins/mpc_plugin.c
+++ b/src/inputPlugins/mpc_plugin.c
@@ -284,11 +284,11 @@ static struct mpd_tag *mpcTagDup(char *file)
return NULL;
}
- ret = apeDup(file);
+ ret = tag_ape_load(file);
if (!ret)
- ret = id3Dup(file);
+ ret = tag_id3_load(file);
if (!ret)
- ret = newMpdTag();
+ ret = tag_new();
ret->time = total_time;
return ret;
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c
index 0ff54df60..bb8af4465 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -163,9 +163,9 @@ static unsigned int ogg_parseCommentAddToTag(char *comment,
if (strncasecmp(comment, needle, len) == 0 && *(comment + len) == '=') {
if (!*tag)
- *tag = newMpdTag();
+ *tag = tag_new();
- addItemToMpdTag(*tag, itemType, comment + len + 1);
+ tag_add_item(*tag, itemType, comment + len + 1);
return 1;
}
@@ -197,14 +197,14 @@ static void putOggCommentsIntoOutputBuffer(char *streamName,
tag = oggCommentsParse(comments);
if (!tag && streamName) {
- tag = newMpdTag();
+ tag = tag_new();
}
if (!tag)
return;
if (streamName) {
- clearItemsFromMpdTag(tag, TAG_ITEM_NAME);
- addItemToMpdTag(tag, TAG_ITEM_NAME, streamName);
+ tag_clear_items_by_type(tag, TAG_ITEM_NAME);
+ tag_add_item(tag, TAG_ITEM_NAME, streamName);
}
metadata_pipe_send(tag, cur_time);
@@ -352,7 +352,7 @@ static struct mpd_tag *oggvorbis_TagDup(char *file)
ret = oggCommentsParse(ov_comment(&vf, -1)->user_comments);
if (!ret)
- ret = newMpdTag();
+ ret = tag_new();
ret->time = (int)(ov_time_total(&vf, -1) + 0.5);
ov_clear(&vf);
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index a97242239..c8b4ac339 100644
--- a/src/inputPlugins/wavpack_plugin.c
+++ b/src/inputPlugins/wavpack_plugin.c
@@ -285,9 +285,9 @@ static struct mpd_tag *wavpack_tagdup(char *fname)
return NULL;
}
- tag = newMpdTag();
+ tag = tag_new();
if (tag == NULL) {
- ERROR("failed to newMpdTag()\n");
+ ERROR("failed to tag_new()\n");
return NULL;
}
@@ -314,7 +314,7 @@ static struct mpd_tag *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);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 07:12:15 +0000