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/audioOutputs/audioOutput_shout.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/audioOutputs')
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index c1f784986..cc5b36e29 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -56,7 +56,7 @@ typedef struct _ShoutData {
int opened;
- MpdTag *tag;
+ struct mpd_tag *tag;
int tagToSend;
int timeout;
@@ -663,7 +663,7 @@ static int myShout_play(AudioOutput * audioOutput,
return 0;
}
-static void myShout_setTag(AudioOutput * audioOutput, MpdTag * tag)
+static void myShout_setTag(AudioOutput * audioOutput, struct mpd_tag *tag)
{
ShoutData *sd = (ShoutData *) audioOutput->data;
--
cgit v1.2.3
From 95451b5821da1383f476cd8d6c6c8d12e683b777 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 29 Aug 2008 09:38:21 +0200
Subject: tag: renamed functions, no CamelCase
---
src/audioOutputs/audioOutput_shout.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'src/audioOutputs')
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index cc5b36e29..7dfa702e1 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -93,7 +93,7 @@ static void freeShoutData(ShoutData * sd)
if (sd->shoutConn)
shout_free(sd->shoutConn);
if (sd->tag)
- freeMpdTag(sd->tag);
+ tag_free(sd->tag);
if (sd->timer)
timer_free(sd->timer);
@@ -593,7 +593,7 @@ static void myShout_sendMetadata(ShoutData * sd)
}
}
- /*if(sd->tag) freeMpdTag(sd->tag);
+ /*if(sd->tag) tag_free(sd->tag);
sd->tag = NULL; */
sd->tagToSend = 0;
}
@@ -668,14 +668,14 @@ static void myShout_setTag(AudioOutput * audioOutput, struct mpd_tag *tag)
ShoutData *sd = (ShoutData *) audioOutput->data;
if (sd->tag)
- freeMpdTag(sd->tag);
+ tag_free(sd->tag);
sd->tag = NULL;
sd->tagToSend = 0;
if (!tag)
return;
- sd->tag = mpdTagDup(tag);
+ sd->tag = tag_dup(tag);
sd->tagToSend = 1;
}
--
cgit v1.2.3
From fbe650b1e022f6ca69cc95d79019f218f450e791 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Fri, 29 Aug 2008 15:02:49 +0200
Subject: tag: fix the shout and oggflac plugins
During the tag library refactoring, the shout plugin was disabled, and
I forgot about adapting it to the new API. Apply the same fixes to
the oggflac decoder plugin.
---
src/audioOutputs/audioOutput_shout.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'src/audioOutputs')
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index 7dfa702e1..b65a8253f 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -402,15 +402,15 @@ static void copyTagToVorbisComment(ShoutData * sd)
int i;
for (i = 0; i < sd->tag->numOfItems; i++) {
- switch (sd->tag->items[i].type) {
+ switch (sd->tag->items[i]->type) {
case TAG_ITEM_ARTIST:
- addTag(sd, "ARTIST", sd->tag->items[i].value);
+ addTag(sd, "ARTIST", sd->tag->items[i]->value);
break;
case TAG_ITEM_ALBUM:
- addTag(sd, "ALBUM", sd->tag->items[i].value);
+ addTag(sd, "ALBUM", sd->tag->items[i]->value);
break;
case TAG_ITEM_TITLE:
- addTag(sd, "TITLE", sd->tag->items[i].value);
+ addTag(sd, "TITLE", sd->tag->items[i]->value);
break;
default:
break;
@@ -663,7 +663,7 @@ static int myShout_play(AudioOutput * audioOutput,
return 0;
}
-static void myShout_setTag(AudioOutput * audioOutput, struct mpd_tag *tag)
+static void myShout_setTag(AudioOutput * audioOutput, const struct mpd_tag *tag)
{
ShoutData *sd = (ShoutData *) audioOutput->data;
--
cgit v1.2.3