aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-29 15:02:49 +0200
committerMax Kellermann <max@duempel.org>2008-08-29 15:02:49 +0200
commit01f9684f704a244467748a12832b562b7a3d09e5 (patch)
treefa2f0a61eca90b7d5f573bb8503d89fe68778375
parent37d77caa3c262c99ce3697224c1423e293d420ee (diff)
downloadmpd-01f9684f704a244467748a12832b562b7a3d09e5.tar.gz
mpd-01f9684f704a244467748a12832b562b7a3d09e5.tar.xz
mpd-01f9684f704a244467748a12832b562b7a3d09e5.zip
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.
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_shout.c16
-rw-r--r--src/inputPlugins/oggflac_plugin.c6
2 files changed, 12 insertions, 10 deletions
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index bf57a593f..f33455850 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);
@@ -403,15 +403,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,19 +663,19 @@ static int myShout_play(AudioOutput * audioOutput,
return 0;
}
-static void myShout_setTag(AudioOutput * audioOutput, struct tag *tag)
+static void myShout_setTag(AudioOutput * audioOutput, const struct 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;
}
diff --git a/src/inputPlugins/oggflac_plugin.c b/src/inputPlugins/oggflac_plugin.c
index e0527f7b7..9a0d6b370 100644
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -28,6 +28,8 @@
#include "../utils.h"
#include "../log.h"
+#include <OggFLAC/seekable_stream_decoder.h>
+
static void oggflac_cleanup(FlacData * data,
OggFLAC__SeekableStreamDecoder * decoder)
{
@@ -210,7 +212,7 @@ static void of_metadata_dup_cb(const OggFLAC__SeekableStreamDecoder * decoder,
switch (block->type) {
case FLAC__METADATA_TYPE_STREAMINFO:
if (!data->tag)
- data->tag = newMpdTag();
+ data->tag = tag_new();
data->tag->time = ((float)block->data.stream_info.
total_samples) /
block->data.stream_info.sample_rate + 0.5;
@@ -294,7 +296,7 @@ fail:
}
/* public functions: */
-static MpdTag *oggflac_TagDup(char *file)
+static struct tag *oggflac_TagDup(char *file)
{
InputStream inStream;
OggFLAC__SeekableStreamDecoder *decoder;