From 8ae390f65142ed38a0b5e2474fc6a21866092e84 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 29 Aug 2008 09:38:11 +0200
Subject: tag: renamed MpdTag and MpdTagItem to struct mpd_tag, struct tag_item

Getting rid of CamelCase; not having typedefs also allows us to
forward-declare the structures.
---
 src/inputPlugins/_flac_common.c     |  6 +++---
 src/inputPlugins/_flac_common.h     |  6 +++---
 src/inputPlugins/aac_plugin.c       |  4 ++--
 src/inputPlugins/audiofile_plugin.c |  4 ++--
 src/inputPlugins/flac_plugin.c      | 14 +++++++-------
 src/inputPlugins/mod_plugin.c       |  4 ++--
 src/inputPlugins/mp3_plugin.c       | 18 +++++++++---------
 src/inputPlugins/mp4_plugin.c       | 10 +++++-----
 src/inputPlugins/mpc_plugin.c       |  4 ++--
 src/inputPlugins/oggflac_plugin.c   |  2 +-
 src/inputPlugins/oggvorbis_plugin.c | 12 ++++++------
 src/inputPlugins/wavpack_plugin.c   |  4 ++--
 12 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'src/inputPlugins')

diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c
index 6890c7c50..6307af00d 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/inputPlugins/_flac_common.c
@@ -101,7 +101,7 @@ static const char *VORBIS_COMMENT_DISC_KEY = "discnumber";
 static unsigned int commentMatchesAddToTag(const
 					   FLAC__StreamMetadata_VorbisComment_Entry
 					   * entry, unsigned int itemType,
-					   MpdTag ** tag)
+					   struct mpd_tag ** tag)
 {
 	const char *str;
 	size_t slen;
@@ -134,8 +134,8 @@ static unsigned int commentMatchesAddToTag(const
 	return 0;
 }
 
-MpdTag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block,
-				       MpdTag * tag)
+struct mpd_tag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block,
+					   struct mpd_tag * tag)
 {
 	unsigned int i, j;
 	FLAC__StreamMetadata_VorbisComment_Entry *comments;
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index 6fe5bd744..a1b0cac8f 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -146,7 +146,7 @@ typedef struct {
 	FLAC__uint64 position;
 	InputStream *inStream;
 	ReplayGainInfo *replayGainInfo;
-	MpdTag *tag;
+	struct mpd_tag *tag;
 } FlacData;
 
 /* initializes a given FlacData struct */
@@ -157,8 +157,8 @@ void flac_error_common_cb(const char *plugin,
 			  FLAC__StreamDecoderErrorStatus status,
 			  FlacData * data);
 
-MpdTag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block,
-				       MpdTag * tag);
+struct mpd_tag *copyVorbisCommentBlockToMpdTag(const FLAC__StreamMetadata * block,
+					   struct mpd_tag *tag);
 
 /* keep this inlined, this is just macro but prettier :) */
 static inline enum dc_action flacSendChunk(FlacData * data)
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index 512e73e53..161b1b9b8 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -553,9 +553,9 @@ out:
 	return 0;
 }
 
-static MpdTag *aacTagDup(char *file)
+static struct mpd_tag *aacTagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	int file_time = getAacTotalTime(file);
 
 	if (file_time >= 0) {
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c
index fcebf562b..ce8eb68d4 100644
--- a/src/inputPlugins/audiofile_plugin.c
+++ b/src/inputPlugins/audiofile_plugin.c
@@ -116,9 +116,9 @@ static int audiofile_decode(char *path)
 	return 0;
 }
 
-static MpdTag *audiofileTagDup(char *file)
+static struct mpd_tag *audiofileTagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	int total_time = getAudiofileTotalTime(file);
 
 	if (total_time >= 0) {
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index de0648c90..c376497a9 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -292,9 +292,9 @@ static FLAC__StreamDecoderWriteStatus flacWrite(const flac_decoder *dec,
 	return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
 }
 
-static MpdTag *flacMetadataDup(char *file, int *vorbisCommentFound)
+static struct mpd_tag *flacMetadataDup(char *file, int *vorbisCommentFound)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	FLAC__Metadata_SimpleIterator *it;
 	FLAC__StreamMetadata *block = NULL;
 
@@ -350,9 +350,9 @@ static MpdTag *flacMetadataDup(char *file, int *vorbisCommentFound)
 	return ret;
 }
 
-static MpdTag *flacTagDup(char *file)
+static struct mpd_tag *flacTagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	int foundVorbisComment = 0;
 
 	ret = flacMetadataDup(file, &foundVorbisComment);
@@ -362,7 +362,7 @@ static MpdTag *flacTagDup(char *file)
 		return NULL;
 	}
 	if (!foundVorbisComment) {
-		MpdTag *temp = id3Dup(file);
+		struct mpd_tag *temp = id3Dup(file);
 		if (temp) {
 			temp->time = ret->time;
 			freeMpdTag(ret);
@@ -466,9 +466,9 @@ static int flac_decode(InputStream * inStream)
 /* some of this stuff is duplicated from oggflac_plugin.c */
 extern InputPlugin oggflacPlugin;
 
-static MpdTag *oggflac_tag_dup(char *file)
+static struct mpd_tag *oggflac_tag_dup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	FLAC__Metadata_Iterator *it;
 	FLAC__StreamMetadata *block;
 	FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new();
diff --git a/src/inputPlugins/mod_plugin.c b/src/inputPlugins/mod_plugin.c
index df938f0ed..c954f064d 100644
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/inputPlugins/mod_plugin.c
@@ -205,9 +205,9 @@ static int mod_decode(char *path)
 	return 0;
 }
 
-static MpdTag *modTagDup(char *file)
+static struct mpd_tag *modTagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	MODULE *moduleHandle;
 	char *title;
 
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index f1304f401..9644e7a62 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -301,13 +301,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 mpd_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 mpd_tag *tmpMpdTag;
 	ReplayGainInfo *tmpReplayGainInfo;
 
 	count = data->stream.bufend - data->stream.this_frame;
@@ -373,7 +373,7 @@ fail:
 #endif
 
 static enum mp3_action
-decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
+decodeNextFrameHeader(mp3DecodeData * data, struct mpd_tag ** tag,
 		      ReplayGainInfo ** replayGainInfo)
 {
 	enum mad_layer layer;
@@ -688,7 +688,7 @@ static int parse_lame(struct lame *lame, struct mad_bitptr *ptr, int *bitlen)
 }
 
 static int decodeFirstFrame(mp3DecodeData * data,
-                            MpdTag ** tag, ReplayGainInfo ** replayGainInfo)
+                            struct mpd_tag ** tag, ReplayGainInfo ** replayGainInfo)
 {
 	struct xing xing;
 	struct lame lame;
@@ -811,7 +811,7 @@ static int getMp3TotalTime(char *file)
 }
 
 static int openMp3FromInputStream(InputStream * inStream, mp3DecodeData * data,
-				  MpdTag ** tag,
+				  struct mpd_tag ** tag,
 				  ReplayGainInfo ** replayGainInfo)
 {
 	initMp3DecodeData(data, inStream);
@@ -923,7 +923,7 @@ mp3Read(mp3DecodeData * data, ReplayGainInfo ** replayGainInfo)
 		}
 
 		if (data->inStream->metaTitle) {
-			MpdTag *tag = newMpdTag();
+			struct mpd_tag *tag = newMpdTag();
 			if (data->inStream->metaName) {
 				addItemToMpdTag(tag,
 						TAG_ITEM_NAME,
@@ -1033,7 +1033,7 @@ static void initAudioFormatFromMp3DecodeData(mp3DecodeData * data,
 static int mp3_decode(InputStream * inStream)
 {
 	mp3DecodeData data;
-	MpdTag *tag = NULL;
+	struct mpd_tag *tag = NULL;
 	ReplayGainInfo *replayGainInfo = NULL;
 
 	if (openMp3FromInputStream(inStream, &data, &tag, &replayGainInfo) < 0) {
@@ -1081,9 +1081,9 @@ static int mp3_decode(InputStream * inStream)
 	return 0;
 }
 
-static MpdTag *mp3_tagDup(char *file)
+static struct mpd_tag *mp3_tagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	int total_time;
 
 	ret = id3Dup(file);
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index 8e3d02354..543ff76b7 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -284,9 +284,9 @@ static int mp4_decode(InputStream * inStream)
 	return 0;
 }
 
-static MpdTag *mp4DataDup(char *file, int *mp4MetadataFound)
+static struct mpd_tag *mp4DataDup(char *file, int *mp4MetadataFound)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	InputStream inStream;
 	mp4ff_t *mp4fh;
 	mp4ff_callback_t *callback;
@@ -373,16 +373,16 @@ static MpdTag *mp4DataDup(char *file, int *mp4MetadataFound)
 	return ret;
 }
 
-static MpdTag *mp4TagDup(char *file)
+static struct mpd_tag *mp4TagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	int mp4MetadataFound = 0;
 
 	ret = mp4DataDup(file, &mp4MetadataFound);
 	if (!ret)
 		return NULL;
 	if (!mp4MetadataFound) {
-		MpdTag *temp = id3Dup(file);
+		struct mpd_tag *temp = id3Dup(file);
 		if (temp) {
 			temp->time = ret->time;
 			freeMpdTag(ret);
diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c
index ea27d1dbf..e3e16e8b3 100644
--- a/src/inputPlugins/mpc_plugin.c
+++ b/src/inputPlugins/mpc_plugin.c
@@ -273,9 +273,9 @@ static float mpcGetTime(char *file)
 	return total_time;
 }
 
-static MpdTag *mpcTagDup(char *file)
+static struct mpd_tag *mpcTagDup(char *file)
 {
-	MpdTag *ret = NULL;
+	struct mpd_tag *ret = NULL;
 	float total_time = mpcGetTime(file);
 
 	if (total_time < 0) {
diff --git a/src/inputPlugins/oggflac_plugin.c b/src/inputPlugins/oggflac_plugin.c
index 4b3bb0a6b..a12512dfc 100644
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -300,7 +300,7 @@ fail:
 }
 
 /* public functions: */
-static MpdTag *oggflac_TagDup(char *file)
+static struct mpd_tag *oggflac_TagDup(char *file)
 {
 	InputStream inStream;
 	OggFLAC__SeekableStreamDecoder *decoder;
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c
index d14ae2bac..0ff54df60 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -145,7 +145,7 @@ static const char *VORBIS_COMMENT_DISC_KEY = "discnumber";
 
 static unsigned int ogg_parseCommentAddToTag(char *comment,
 					     unsigned int itemType,
-					     MpdTag ** tag)
+					     struct mpd_tag ** tag)
 {
 	const char *needle;
 	unsigned int len;
@@ -173,9 +173,9 @@ static unsigned int ogg_parseCommentAddToTag(char *comment,
 	return 0;
 }
 
-static MpdTag *oggCommentsParse(char **comments)
+static struct mpd_tag *oggCommentsParse(char **comments)
 {
-	MpdTag *tag = NULL;
+	struct mpd_tag *tag = NULL;
 
 	while (*comments) {
 		int j;
@@ -193,7 +193,7 @@ static void putOggCommentsIntoOutputBuffer(char *streamName,
 					   char **comments,
 					   float cur_time)
 {
-	MpdTag *tag;
+	struct mpd_tag *tag;
 
 	tag = oggCommentsParse(comments);
 	if (!tag && streamName) {
@@ -332,9 +332,9 @@ static int oggvorbis_decode(InputStream * inStream)
 	return 0;
 }
 
-static MpdTag *oggvorbis_TagDup(char *file)
+static struct mpd_tag *oggvorbis_TagDup(char *file)
 {
-	MpdTag *ret;
+	struct mpd_tag *ret;
 	FILE *fp;
 	OggVorbis_File vf;
 
diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c
index c7e024a41..a97242239 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;
-- 
cgit v1.2.3