tag: renamed MpdTag and MpdTagItem to struct tag, struct mpd_tag_item

Getting rid of CamelCase; not having typedefs also allows us to
forward-declare the structures.

1 files changed, 9 insertions, 9 deletions

diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index c836a7a46..0d1c8e99a 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -299,13 +299,13 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag)
 
 #ifdef HAVE_ID3TAG
 static void mp3_parseId3Tag(mp3DecodeData * data, size_t tagsize,
-			    MpdTag ** mpdTag, ReplayGainInfo ** replayGainInfo)
+			    struct tag ** mpdTag, ReplayGainInfo ** replayGainInfo)
 {
 	struct id3_tag *id3Tag = NULL;
 	id3_length_t count;
 	id3_byte_t const *id3_data;
 	id3_byte_t *allocated = NULL;
-	MpdTag *tmpMpdTag;
+	struct tag *tmpMpdTag;
 	ReplayGainInfo *tmpReplayGainInfo;
 
 	count = data->stream.bufend - data->stream.this_frame;
@@ -370,7 +370,7 @@ fail:
 #endif
 
 static enum mp3_action
-decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
+decodeNextFrameHeader(mp3DecodeData * data, struct tag ** tag,
 		      ReplayGainInfo ** replayGainInfo)
 {
 	enum mad_layer layer;
@@ -685,7 +685,7 @@ static int parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
 }
 
 static int decodeFirstFrame(mp3DecodeData * data,
-                            MpdTag ** tag, ReplayGainInfo ** replayGainInfo)
+                            struct tag ** tag, ReplayGainInfo ** replayGainInfo)
 {
 	struct decoder *decoder = data->decoder;
 	struct xing xing;
@@ -813,7 +813,7 @@ static int getMp3TotalTime(char *file)
 }
 
 static int openMp3FromInputStream(InputStream * inStream, mp3DecodeData * data,
-				  struct decoder * decoder, MpdTag ** tag,
+				  struct decoder * decoder, struct tag ** tag,
 				  ReplayGainInfo ** replayGainInfo)
 {
 	initMp3DecodeData(data, decoder, inStream);
@@ -896,7 +896,7 @@ mp3Read(mp3DecodeData * data, ReplayGainInfo ** replayGainInfo)
 		}
 
 		if (data->inStream->metaTitle) {
-			MpdTag *tag = newMpdTag();
+			struct tag *tag = newMpdTag();
 			if (data->inStream->metaName) {
 				addItemToMpdTag(tag,
 						TAG_ITEM_NAME,
@@ -1032,7 +1032,7 @@ static void initAudioFormatFromMp3DecodeData(mp3DecodeData * data,
 static int mp3_decode(struct decoder * decoder, InputStream * inStream)
 {
 	mp3DecodeData data;
-	MpdTag *tag = NULL;
+	struct tag *tag = NULL;
 	ReplayGainInfo *replayGainInfo = NULL;
 	AudioFormat audio_format;
 
@@ -1092,9 +1092,9 @@ static int mp3_decode(struct decoder * decoder, InputStream * inStream)
 	return 0;
 }
 
-static MpdTag *mp3_tagDup(char *file)
+static struct tag *mp3_tagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct tag *ret = NULL;
 	int total_time;
 
 	ret = id3Dup(file);