aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs/audioOutput_shout.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_shout.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index c1f784986..b65a8253f 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;
@@ -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);
@@ -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;
@@ -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;
}
@@ -663,19 +663,19 @@ static int myShout_play(AudioOutput * audioOutput,
return 0;
}
-static void myShout_setTag(AudioOutput * audioOutput, MpdTag * tag)
+static void myShout_setTag(AudioOutput * audioOutput, const 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;
}