From 4ffadb378e80545496c77a986a44f26ef12f08b4 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 26 Nov 2003 23:17:50 +0000 Subject: [PATCH] Made gst_vorbis_tag_add public Original commit message from CVS: Made gst_vorbis_tag_add public --- gst/tags/gsttagediting.c | 2 +- gst/tags/gsttagediting.h | 2 ++ gst/tags/gstvorbistag.c | 11 +++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/gst/tags/gsttagediting.c b/gst/tags/gsttagediting.c index 00de40723b..4f1b5891b7 100644 --- a/gst/tags/gsttagediting.c +++ b/gst/tags/gsttagediting.c @@ -1,7 +1,7 @@ /* GStreamer * Copyright (C) 2003 Benjamin Otte * - * gstoggplugins.c: register ogg plugins + * gsttagediting.c: tag editing plugin * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/gst/tags/gsttagediting.h b/gst/tags/gsttagediting.h index 8a0cc28600..be0e298754 100644 --- a/gst/tags/gsttagediting.h +++ b/gst/tags/gsttagediting.h @@ -30,6 +30,8 @@ G_BEGIN_DECLS G_CONST_RETURN gchar * gst_tag_from_vorbis_tag (const gchar * vorbis_tag); G_CONST_RETURN gchar * gst_tag_to_vorbis_tag (const gchar * gst_tag); +void gst_vorbis_tag_add (GstTagList *list, const gchar *tag, const gchar *value); + /* functions to convert GstBuffers with vorbiscomment contents to GstTagLists and back */ GstTagList * gst_tag_list_from_vorbiscomment_buffer (const GstBuffer * buffer, const guint8 * id_data, diff --git a/gst/tags/gstvorbistag.c b/gst/tags/gstvorbistag.c index c35b452120..f0c8fff18f 100644 --- a/gst/tags/gstvorbistag.c +++ b/gst/tags/gstvorbistag.c @@ -26,6 +26,7 @@ #include "gsttageditingprivate.h" #include + GST_DEBUG_CATEGORY_STATIC (gst_vorbis_tag_debug); #define GST_CAT_DEFAULT gst_vorbis_tag_debug @@ -249,8 +250,10 @@ gst_tag_to_vorbis_tag (const gchar *gst_tag) } return NULL; } -static void -gst_tag_add (GstTagList *list, const gchar *tag, const gchar *value) + + +void +gst_vorbis_tag_add (GstTagList *list, const gchar *tag, const gchar *value) { const gchar *gst_tag = gst_tag_from_vorbis_tag (tag); @@ -365,7 +368,7 @@ gst_tag_list_from_vorbiscomment_buffer (const GstBuffer *buffer, const guint8 *i g_free (cur); continue; } - gst_tag_add (list, cur, value); + gst_vorbis_tag_add (list, cur, value); g_free (cur); } @@ -496,7 +499,7 @@ gst_vorbis_tag_chain (GstPad *pad, GstData *data) if (tag->output == OUTPUT_UNKNOWN) { /* caps nego */ do { - if (gst_pad_try_set_caps (tag->srcpad, GST_CAPS_NEW ("vorbis_tag_data_src", "application/x-vorbis", NULL)) >= 0) { + if (gst_pad_try_set_caps (tag->srcpad, GST_CAPS_NEW ("vorbis_tag_data_src", "audio/x-vorbis", NULL)) >= 0) { tag->output = OUTPUT_DATA; } else if (gst_pad_try_set_caps (tag->srcpad, GST_CAPS_NEW ("vorbis_tag_tag_src", "application/x-gst-tags", NULL)) >= 0) { tag->output = OUTPUT_TAGS;