From 8db163abcff952f3a141e3939d45eb757c92db25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 5 Feb 2006 18:01:33 +0000 Subject: [PATCH] Add libgsttag to the docs. Original commit message from CVS: * docs/libs/Makefile.am: * docs/libs/gst-plugins-base-libs-docs.sgml: * docs/libs/gst-plugins-base-libs-sections.txt: * gst-libs/gst/tag/gstid3tag.c: (gst_tag_from_id3_tag): * gst-libs/gst/tag/gstvorbistag.c: * gst-libs/gst/tag/tag.h: * gst-libs/gst/tag/tags.c: Add libgsttag to the docs. --- ChangeLog | 11 ++++++++ docs/libs/Makefile.am | 3 ++- docs/libs/gst-plugins-base-libs-docs.sgml | 11 ++++++++ docs/libs/gst-plugins-base-libs-sections.txt | 27 ++++++++++++++++++++ gst-libs/gst/tag/gstid3tag.c | 8 ++++-- gst-libs/gst/tag/gstvorbistag.c | 8 +++--- gst-libs/gst/tag/tag.h | 2 +- gst-libs/gst/tag/tags.c | 23 +++++++++++++++++ 8 files changed, 85 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87d2e749e7..259e98491d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-02-05 Tim-Philipp Müller + + * docs/libs/Makefile.am: + * docs/libs/gst-plugins-base-libs-docs.sgml: + * docs/libs/gst-plugins-base-libs-sections.txt: + * gst-libs/gst/tag/gstid3tag.c: (gst_tag_from_id3_tag): + * gst-libs/gst/tag/gstvorbistag.c: + * gst-libs/gst/tag/tag.h: + * gst-libs/gst/tag/tags.c: + Add libgsttag to the docs. + 2006-02-05 Julien MOUTTE * ext/pango/gsttextoverlay.c: (gst_text_overlay_finalize), diff --git a/docs/libs/Makefile.am b/docs/libs/Makefile.am index 6c64e59ac6..c54dbd7c9b 100644 --- a/docs/libs/Makefile.am +++ b/docs/libs/Makefile.am @@ -65,7 +65,8 @@ CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*.c SCANOBJ_DEPS = \ $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la + $(top_builddir)/gst-libs/gst/cdda/libgstcdda-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_MAJORMINOR@.la # Header files to ignore when scanning. IGNORE_HFILES = diff --git a/docs/libs/gst-plugins-base-libs-docs.sgml b/docs/libs/gst-plugins-base-libs-docs.sgml index 70bb00660f..c9678277b4 100644 --- a/docs/libs/gst-plugins-base-libs-docs.sgml +++ b/docs/libs/gst-plugins-base-libs-docs.sgml @@ -13,6 +13,7 @@ + @@ -67,6 +68,16 @@ This library should be linked to by getting cflags and libs from &GstXOverlay; + + Tag Support Library + +This library should be linked to by getting cflags and libs from +gstreamer-plugins-base.pc and adding +-lgsttag-&GST_MAJORMINOR; to the library flags. + + &GstTag; + + CDDA Library diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index a979b0278c..71fc6e87f9 100644 --- a/docs/libs/gst-plugins-base-libs-sections.txt +++ b/docs/libs/gst-plugins-base-libs-sections.txt @@ -91,6 +91,33 @@ gst_ring_buffer_advance +
+gsttag +gst/tag/tag.h + +gst_tag_from_vorbis_tag +gst_tag_to_vorbis_tag +gst_vorbis_tag_add +gst_tag_to_vorbis_comments + +gst_tag_list_from_vorbiscomment_buffer +gst_tag_list_to_vorbiscomment_buffer + +gst_tag_id3_genre_count +gst_tag_id3_genre_get +gst_tag_list_new_from_id3v1 +gst_tag_from_id3_tag +gst_tag_to_id3_tag + +GST_TAG_MUSICBRAINZ_TRACKID +GST_TAG_MUSICBRAINZ_ARTISTID +GST_TAG_MUSICBRAINZ_ALBUMID +GST_TAG_MUSICBRAINZ_ALBUMARTISTID +GST_TAG_MUSICBRAINZ_TRMID +GST_TAG_MUSICBRAINZ_SORTNAME +gst_tag_register_musicbrainz_tags +
+
gsttuner gst/interfaces/tuner.h diff --git a/gst-libs/gst/tag/gstid3tag.c b/gst-libs/gst/tag/gstid3tag.c index 419c31af55..6ee79b0caa 100644 --- a/gst-libs/gst/tag/gstid3tag.c +++ b/gst-libs/gst/tag/gstid3tag.c @@ -209,11 +209,15 @@ gst_tag_from_id3_tag (const gchar * id3_tag) while (tag_matches[i].gstreamer_tag != NULL) { if (strncmp (id3_tag, tag_matches[i].original_tag, 5) == 0) { - break; + return tag_matches[i].gstreamer_tag; } i++; } - return tag_matches[i].gstreamer_tag; + + GST_INFO ("Cannot map ID3v2 tag '%c%c%c%c' to GStreamer tag", + id3_tag[0], id3_tag[1], id3_tag[2], id3_tag[3]); + + return NULL; } /** diff --git a/gst-libs/gst/tag/gstvorbistag.c b/gst-libs/gst/tag/gstvorbistag.c index 548d2d22a9..3866b5a062 100644 --- a/gst-libs/gst/tag/gstvorbistag.c +++ b/gst-libs/gst/tag/gstvorbistag.c @@ -222,8 +222,8 @@ gst_vorbis_tag_add (GstTagList * list, const gchar * tag, const gchar * value) * @buffer: buffer to convert * @id_data: identification data at start of stream * @id_data_length: length of identification data - * @ vendor_string: pointer to a string that should take the vendor string of this - * vorbis comment or NULL if you don't need it. + * @vendor_string: pointer to a string that should take the vendor string + * of this vorbis comment or NULL if you don't need it. * * Creates a new tag list that contains the information parsed out of a * vorbiscomment packet. @@ -390,10 +390,10 @@ write_one_tag (const GstTagList * list, const gchar * tag, gpointer user_data) /** * gst_tag_list_to_vorbiscomment_buffer: - * @buffer: tag list to convert + * @list: tag list to convert * @id_data: identification data at start of stream * @id_data_length: length of identification data - * @ vendor_string: string that describes the vendor string or NULL + * @vendor_string: string that describes the vendor string or NULL * * Creates a new vorbiscomment buffer from a tag list. * diff --git a/gst-libs/gst/tag/tag.h b/gst-libs/gst/tag/tag.h index c9e18e695f..3276440484 100644 --- a/gst-libs/gst/tag/tag.h +++ b/gst-libs/gst/tag/tag.h @@ -92,7 +92,7 @@ guint gst_tag_id3_genre_count (void); G_CONST_RETURN gchar * gst_tag_id3_genre_get (const guint id); GstTagList * gst_tag_list_new_from_id3v1 (const guint8 * data); -G_CONST_RETURN gchar * gst_tag_from_id3_tag (const gchar * vorbis_tag); +G_CONST_RETURN gchar * gst_tag_from_id3_tag (const gchar * id3_tag); G_CONST_RETURN gchar * gst_tag_to_id3_tag (const gchar * gst_tag); void gst_tag_register_musicbrainz_tags (void); diff --git a/gst-libs/gst/tag/tags.c b/gst-libs/gst/tag/tags.c index 41d1ad0e59..c8b32d8ba2 100644 --- a/gst-libs/gst/tag/tags.c +++ b/gst-libs/gst/tag/tags.c @@ -27,6 +27,22 @@ #include #include "tag.h" +/** + * SECTION:gsttag + * @short_description: Tag Support Library + * @see_also: #GstTagList + * + * + * + * Contains additional standardized GStreamer tag definitions and + * various utility functions for plugins to parse or create different + * types of tags. Also provides mappings from and to other tag identifiers + * to the GStreamer tag identifier. + * + * + */ + + static gpointer gst_tag_register_musicbrainz_tags_internal (gpointer unused) { @@ -54,6 +70,13 @@ gst_tag_register_musicbrainz_tags_internal (gpointer unused) return NULL; } +/** + * gst_tag_register_musicbrainz_tags + * + * Registers additional musicbrainz-specific tags with the GStreamer tag + * system. Plugins and applications that use these tags should call this + * function before using them. Can be called multiple times. + */ void gst_tag_register_musicbrainz_tags (void) {