From 09a304b39ad5d5b692ca0893fc98c959e5a16da7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 6 Jun 2009 00:39:10 +0100 Subject: id3tag: rename new id3tag element to id3mux replacing the one removed from -ugly --- docs/plugins/inspect/plugin-id3tag.xml | 2 +- gst/id3tag/Makefile.am | 6 +- gst/id3tag/gstid3mux.c | 229 +++++++++++++++++++++++++++++++++ gst/id3tag/gstid3mux.h | 63 +++++++++ gst/id3tag/gstid3tag.c | 229 --------------------------------- gst/id3tag/gstid3tag.h | 63 --------- gst/id3tag/gsttagmux.c | 10 +- gst/id3tag/id3tag.c | 8 +- gst/id3tag/id3tag.h | 4 +- 9 files changed, 307 insertions(+), 307 deletions(-) create mode 100644 gst/id3tag/gstid3mux.c create mode 100644 gst/id3tag/gstid3mux.h delete mode 100644 gst/id3tag/gstid3tag.c delete mode 100644 gst/id3tag/gstid3tag.h diff --git a/docs/plugins/inspect/plugin-id3tag.xml b/docs/plugins/inspect/plugin-id3tag.xml index 4f5b3478..942e9b47 100644 --- a/docs/plugins/inspect/plugin-id3tag.xml +++ b/docs/plugins/inspect/plugin-id3tag.xml @@ -10,7 +10,7 @@ Unknown package origin - id3tag + id3mux ID3 v1 and v2 Muxer Formatter/Metadata Adds an ID3v2 header and ID3v1 footer to a file diff --git a/gst/id3tag/Makefile.am b/gst/id3tag/Makefile.am index 9595be0f..108a227b 100644 --- a/gst/id3tag/Makefile.am +++ b/gst/id3tag/Makefile.am @@ -1,9 +1,9 @@ plugin_LTLIBRARIES = libgstid3tag.la libgstid3tag_la_SOURCES = \ + gstid3mux.c \ gsttagmux.c \ - id3tag.c \ - gstid3tag.c + id3tag.c libgstid3tag_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ @@ -16,4 +16,4 @@ libgstid3tag_la_LIBADD = \ libgstid3tag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstid3tag_la_LIBTOOLFLAGS = --tag=disable-static -noinst_HEADERS = gstid3tag.h id3tag.h gsttagmux.h +noinst_HEADERS = gstid3mux.h gsttagmux.h id3tag.h diff --git a/gst/id3tag/gstid3mux.c b/gst/id3tag/gstid3mux.c new file mode 100644 index 00000000..9a366754 --- /dev/null +++ b/gst/id3tag/gstid3mux.c @@ -0,0 +1,229 @@ +/* GStreamer ID3 v1 and v2 muxer + * + * Copyright (C) 2006 Christophe Fergeau + * Copyright (C) 2006 Tim-Philipp Müller + * Copyright (C) 2009 Pioneers of the Inevitable + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/** + * SECTION:element-id3mux + * @see_also: #GstID3Demux, #GstTagSetter + * + * This element adds ID3v2 tags to the beginning of a stream, and ID3v1 tags + * to the end. + * + * It defaults to writing ID3 version 2.3.0 tags (since those are the most + * widely supported), but can optionally write version 2.4.0 tags. + * + * Applications can set the tags to write using the #GstTagSetter interface. + * Tags sent by upstream elements will be picked up automatically (and merged + * according to the merge mode set via the tag setter interface). + * + * + * Example pipelines + * |[ + * gst-launch -v filesrc location=foo.ogg ! decodebin ! audioconvert ! lame ! id3mux ! filesink location=foo.mp3 + * ]| A pipeline that transcodes a file from Ogg/Vorbis to mp3 format with + * ID3 tags that contain the same metadata as the the Ogg/Vorbis file. + * Make sure the Ogg/Vorbis file actually has comments to preserve. + * |[ + * gst-launch -m filesrc location=foo.mp3 ! id3demux ! fakesink silent=TRUE 2> /dev/null | grep taglist + * ]| Verify that tags have been written. + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include "gstid3mux.h" +#include + +#include + +GST_DEBUG_CATEGORY (gst_id3_mux_debug); +#define GST_CAT_DEFAULT gst_id3_mux_debug + +enum +{ + ARG_0, + ARG_WRITE_V1, + ARG_WRITE_V2, + ARG_V2_MAJOR_VERSION +}; + +#define DEFAULT_WRITE_V1 TRUE +#define DEFAULT_WRITE_V2 TRUE +#define DEFAULT_V2_MAJOR_VERSION 3 + +static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", + GST_PAD_SRC, + GST_PAD_ALWAYS, + GST_STATIC_CAPS ("application/x-id3")); + +GST_BOILERPLATE (GstId3Mux, gst_id3_mux, GstTagMux, GST_TYPE_TAG_MUX); + +static GstBuffer *gst_id3_mux_render_v2_tag (GstTagMux * mux, + GstTagList * taglist); +static GstBuffer *gst_id3_mux_render_v1_tag (GstTagMux * mux, + GstTagList * taglist); + +static void gst_id3_mux_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec); +static void gst_id3_mux_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec); + +static void +gst_id3_mux_base_init (gpointer g_class) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + gst_element_class_add_pad_template (element_class, + gst_static_pad_template_get (&src_template)); + + gst_element_class_set_details_simple (element_class, + "ID3 v1 and v2 Muxer", "Formatter/Metadata", + "Adds an ID3v2 header and ID3v1 footer to a file", + "Michael Smith , " + "Tim-Philipp Müller "); +} + +static void +gst_id3_mux_class_init (GstId3MuxClass * klass) +{ + GObjectClass *gobject_class = (GObjectClass *) klass; + + gobject_class->set_property = gst_id3_mux_set_property; + gobject_class->get_property = gst_id3_mux_get_property; + + g_object_class_install_property (gobject_class, ARG_WRITE_V1, + g_param_spec_boolean ("write-v1", "Write id3v1 tag", + "Write an id3v1 tag at the end of the file", DEFAULT_WRITE_V1, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (gobject_class, ARG_WRITE_V2, + g_param_spec_boolean ("write-v2", "Write id3v2 tag", + "Write an id3v2 tag at the start of the file", DEFAULT_WRITE_V2, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (gobject_class, ARG_V2_MAJOR_VERSION, + g_param_spec_int ("v2-version", "Version (3 or 4) of id3v2 tag", + "Set version (3 for id3v2.3, 4 for id3v2.4) of id3v2 tags", + 3, 4, DEFAULT_V2_MAJOR_VERSION, + G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + + GST_TAG_MUX_CLASS (klass)->render_start_tag = + GST_DEBUG_FUNCPTR (gst_id3_mux_render_v2_tag); + + GST_TAG_MUX_CLASS (klass)->render_end_tag = gst_id3_mux_render_v1_tag; +} + +static void +gst_id3_mux_init (GstId3Mux * id3mux, GstId3MuxClass * id3mux_class) +{ + id3mux->write_v1 = DEFAULT_WRITE_V1; + id3mux->write_v2 = DEFAULT_WRITE_V2; + + id3mux->v2_major_version = DEFAULT_V2_MAJOR_VERSION; +} + +static void +gst_id3_mux_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstId3Mux *mux = GST_ID3_MUX (object); + + switch (prop_id) { + case ARG_WRITE_V1: + mux->write_v1 = g_value_get_boolean (value); + break; + case ARG_WRITE_V2: + mux->write_v2 = g_value_get_boolean (value); + break; + case ARG_V2_MAJOR_VERSION: + mux->v2_major_version = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_id3_mux_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstId3Mux *mux = GST_ID3_MUX (object); + + switch (prop_id) { + case ARG_WRITE_V1: + g_value_set_boolean (value, mux->write_v1); + break; + case ARG_WRITE_V2: + g_value_set_boolean (value, mux->write_v2); + break; + case ARG_V2_MAJOR_VERSION: + g_value_set_int (value, mux->v2_major_version); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static GstBuffer * +gst_id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist) +{ + GstId3Mux *id3mux = GST_ID3_MUX (mux); + + if (id3mux->write_v2) + return id3_mux_render_v2_tag (mux, taglist, id3mux->v2_major_version); + else + return NULL; +} + +static GstBuffer * +gst_id3_mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist) +{ + GstId3Mux *id3mux = GST_ID3_MUX (mux); + + if (id3mux->write_v1) + return id3_mux_render_v1_tag (mux, taglist); + else + return NULL; +} + +static gboolean +plugin_init (GstPlugin * plugin) +{ + GST_DEBUG_CATEGORY_INIT (gst_id3_mux_debug, "id3mux", 0, + "ID3 v1 and v2 tag muxer"); + + if (!gst_element_register (plugin, "id3mux", GST_RANK_NONE, GST_TYPE_ID3_MUX)) + return FALSE; + + gst_tag_register_musicbrainz_tags (); + + return TRUE; +} + +GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, + "id3tag", + "ID3 v1 and v2 muxing plugin", + plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/id3tag/gstid3mux.h b/gst/id3tag/gstid3mux.h new file mode 100644 index 00000000..eb5aa050 --- /dev/null +++ b/gst/id3tag/gstid3mux.h @@ -0,0 +1,63 @@ +/* GStreamer ID3 v1 and v2 muxer + * + * Copyright (C) 2006 Christophe Fergeau + * Copyright (C) 2006 Tim-Philipp Müller + * Copyright (C) 2009 Pioneers of the Inevitable + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef GST_ID3_MUX_H +#define GST_ID3_MUX_H + +#include "gsttagmux.h" +#include "id3tag.h" + +G_BEGIN_DECLS + +typedef struct _GstId3Mux GstId3Mux; +typedef struct _GstId3MuxClass GstId3MuxClass; + +struct _GstId3Mux { + GstTagMux tagmux; + + gboolean write_v1; + gboolean write_v2; + + gint v2_major_version; +}; + +struct _GstId3MuxClass { + GstTagMuxClass tagmux_class; +}; + +#define GST_TYPE_ID3_MUX \ + (gst_id3_mux_get_type()) +#define GST_ID3_MUX(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ID3_MUX,GstId3Mux)) +#define GST_ID3_MUX_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ID3_MUX,GstId3MuxClass)) +#define GST_IS_ID3_MUX(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ID3_MUX)) +#define GST_IS_ID3_MUX_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ID3_MUX)) + +GType gst_id3_mux_get_type (void); + +G_END_DECLS + +#endif /* GST_ID3_MUX_H */ + diff --git a/gst/id3tag/gstid3tag.c b/gst/id3tag/gstid3tag.c deleted file mode 100644 index 9c8072c0..00000000 --- a/gst/id3tag/gstid3tag.c +++ /dev/null @@ -1,229 +0,0 @@ -/* GStreamer ID3 v1 and v2 muxer - * - * Copyright (C) 2006 Christophe Fergeau - * Copyright (C) 2006 Tim-Philipp Müller - * Copyright (C) 2009 Pioneers of the Inevitable - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/** - * SECTION:element-id3tag - * @see_also: #GstID3Demux, #GstTagSetter - * - * This element adds ID3v2 tags to the beginning of a stream, and ID3v1 tags - * to the end. - * - * It defaults to writing ID3 version 2.3.0 tags (since those are the most - * widely supported), but can optionally write version 2.4.0 tags. - * - * Applications can set the tags to write using the #GstTagSetter interface. - * Tags sent by upstream elements will be picked up automatically (and merged - * according to the merge mode set via the tag setter interface). - * - * - * Example pipelines - * |[ - * gst-launch -v filesrc location=foo.ogg ! decodebin ! audioconvert ! lame ! id3tag ! filesink location=foo.mp3 - * ]| A pipeline that transcodes a file from Ogg/Vorbis to mp3 format with - * ID3 tags that contain the same metadata as the the Ogg/Vorbis file. - * Make sure the Ogg/Vorbis file actually has comments to preserve. - * |[ - * gst-launch -m filesrc location=foo.mp3 ! id3demux ! fakesink silent=TRUE 2> /dev/null | grep taglist - * ]| Verify that tags have been written. - * - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include "gstid3tag.h" -#include - -#include - -GST_DEBUG_CATEGORY (gst_id3_tag_debug); -#define GST_CAT_DEFAULT gst_id3_tag_debug - -enum -{ - ARG_0, - ARG_WRITE_V1, - ARG_WRITE_V2, - ARG_V2_MAJOR_VERSION -}; - -#define DEFAULT_WRITE_V1 TRUE -#define DEFAULT_WRITE_V2 TRUE -#define DEFAULT_V2_MAJOR_VERSION 3 - -static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("application/x-id3")); - -GST_BOILERPLATE (GstId3Tag, gst_id3_tag, GstTagMux, GST_TYPE_TAG_MUX); - -static GstBuffer *gst_id3_tag_render_v2_tag (GstTagMux * mux, - GstTagList * taglist); -static GstBuffer *gst_id3_tag_render_v1_tag (GstTagMux * mux, - GstTagList * taglist); - -static void gst_id3_tag_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_id3_tag_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - -static void -gst_id3_tag_base_init (gpointer g_class) -{ - GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_template)); - - gst_element_class_set_details_simple (element_class, - "ID3 v1 and v2 Muxer", "Formatter/Metadata", - "Adds an ID3v2 header and ID3v1 footer to a file", - "Michael Smith , " - "Tim-Philipp Müller "); - - GST_DEBUG_CATEGORY_INIT (gst_id3_tag_debug, "id3tag", 0, - "ID3 v1 and v2 tag muxer"); -} - -static void -gst_id3_tag_class_init (GstId3TagClass * klass) -{ - GObjectClass *gobject_class = (GObjectClass *) klass; - - gobject_class->set_property = gst_id3_tag_set_property; - gobject_class->get_property = gst_id3_tag_get_property; - - g_object_class_install_property (gobject_class, ARG_WRITE_V1, - g_param_spec_boolean ("write-v1", "Write id3v1 tag", - "Write an id3v1 tag at the end of the file", DEFAULT_WRITE_V1, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, ARG_WRITE_V2, - g_param_spec_boolean ("write-v2", "Write id3v2 tag", - "Write an id3v2 tag at the start of the file", DEFAULT_WRITE_V2, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, ARG_V2_MAJOR_VERSION, - g_param_spec_int ("v2-version", "Version (3 or 4) of id3v2 tag", - "Set version (3 for id3v2.3, 4 for id3v2.4) of id3v2 tags", - 3, 4, DEFAULT_V2_MAJOR_VERSION, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - GST_TAG_MUX_CLASS (klass)->render_start_tag = - GST_DEBUG_FUNCPTR (gst_id3_tag_render_v2_tag); - - GST_TAG_MUX_CLASS (klass)->render_end_tag = gst_id3_tag_render_v1_tag; -} - -static void -gst_id3_tag_init (GstId3Tag * id3mux, GstId3TagClass * id3mux_class) -{ - id3mux->write_v1 = DEFAULT_WRITE_V1; - id3mux->write_v2 = DEFAULT_WRITE_V2; - - id3mux->v2_major_version = DEFAULT_V2_MAJOR_VERSION; -} - -static void -gst_id3_tag_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstId3Tag *mux = GST_ID3TAG (object); - - switch (prop_id) { - case ARG_WRITE_V1: - mux->write_v1 = g_value_get_boolean (value); - break; - case ARG_WRITE_V2: - mux->write_v2 = g_value_get_boolean (value); - break; - case ARG_V2_MAJOR_VERSION: - mux->v2_major_version = g_value_get_int (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_id3_tag_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) -{ - GstId3Tag *mux = GST_ID3TAG (object); - - switch (prop_id) { - case ARG_WRITE_V1: - g_value_set_boolean (value, mux->write_v1); - break; - case ARG_WRITE_V2: - g_value_set_boolean (value, mux->write_v2); - break; - case ARG_V2_MAJOR_VERSION: - g_value_set_int (value, mux->v2_major_version); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static GstBuffer * -gst_id3_tag_render_v2_tag (GstTagMux * mux, GstTagList * taglist) -{ - GstId3Tag *id3mux = GST_ID3TAG (mux); - - if (id3mux->write_v2) - return gst_id3mux_render_v2_tag (mux, taglist, id3mux->v2_major_version); - else - return NULL; -} - -static GstBuffer * -gst_id3_tag_render_v1_tag (GstTagMux * mux, GstTagList * taglist) -{ - GstId3Tag *id3mux = GST_ID3TAG (mux); - - if (id3mux->write_v1) - return gst_id3mux_render_v1_tag (mux, taglist); - else - return NULL; -} - -static gboolean -plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "id3tag", GST_RANK_NONE, GST_TYPE_ID3TAG)) - return FALSE; - - gst_tag_register_musicbrainz_tags (); - - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "id3tag", - "ID3 v1 and v2 muxing plugin", - plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/id3tag/gstid3tag.h b/gst/id3tag/gstid3tag.h deleted file mode 100644 index a9a1ad1c..00000000 --- a/gst/id3tag/gstid3tag.h +++ /dev/null @@ -1,63 +0,0 @@ -/* GStreamer ID3 v1 and v2 muxer - * - * Copyright (C) 2006 Christophe Fergeau - * Copyright (C) 2006 Tim-Philipp Müller - * Copyright (C) 2009 Pioneers of the Inevitable - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef GST_ID3TAG_H -#define GST_ID3TAG_H - -#include "gsttagmux.h" -#include "id3tag.h" - -G_BEGIN_DECLS - -typedef struct _GstId3Tag GstId3Tag; -typedef struct _GstId3TagClass GstId3TagClass; - -struct _GstId3Tag { - GstTagMux tagmux; - - gboolean write_v1; - gboolean write_v2; - - gint v2_major_version; -}; - -struct _GstId3TagClass { - GstTagMuxClass tagmux_class; -}; - -#define GST_TYPE_ID3TAG \ - (gst_id3_tag_get_type()) -#define GST_ID3TAG(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ID3TAG,GstId3Tag)) -#define GST_ID3TAG_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ID3TAG,GstId3TagClass)) -#define GST_IS_ID3TAG(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ID3TAG)) -#define GST_IS_ID3TAG_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ID3TAG)) - -GType gst_id3_tag_get_type (void); - -G_END_DECLS - -#endif /* GST_ID3TAG_H */ - diff --git a/gst/id3tag/gsttagmux.c b/gst/id3tag/gsttagmux.c index 3b7ff119..4aafb96d 100644 --- a/gst/id3tag/gsttagmux.c +++ b/gst/id3tag/gsttagmux.c @@ -57,10 +57,10 @@ gst_tag_mux_iface_init (GType tag_type) /* make sure to register a less generic type so we can easily move this * GstTagMux base class into -base without causing GType name conflicts */ -typedef GstTagMux GstId3TagMux; -typedef GstTagMuxClass GstId3TagMuxClass; +typedef GstTagMux GstId3BaseMux; +typedef GstTagMuxClass GstId3BaseMuxClass; -GST_BOILERPLATE_FULL (GstId3TagMux, gst_tag_mux, +GST_BOILERPLATE_FULL (GstId3BaseMux, gst_tag_mux, GstElement, GST_TYPE_ELEMENT, gst_tag_mux_iface_init); @@ -100,8 +100,8 @@ gst_tag_mux_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&gst_tag_mux_sink_template)); - GST_DEBUG_CATEGORY_INIT (gst_tag_mux_debug, "tagmux", 0, - "tag muxer base class"); + GST_DEBUG_CATEGORY_INIT (gst_tag_mux_debug, "id3basemux", 0, + "tag muxer base class for Id3Mux"); } static void diff --git a/gst/id3tag/id3tag.c b/gst/id3tag/id3tag.c index a39e2a8e..00be7e4c 100644 --- a/gst/id3tag/id3tag.c +++ b/gst/id3tag/id3tag.c @@ -25,8 +25,8 @@ #include -GST_DEBUG_CATEGORY_EXTERN (gst_id3_tag_debug); -#define GST_CAT_DEFAULT gst_id3_tag_debug +GST_DEBUG_CATEGORY_EXTERN (gst_id3_mux_debug); +#define GST_CAT_DEFAULT gst_id3_mux_debug #define ID3V2_APIC_PICTURE_OTHER 0 #define ID3V2_APIC_PICTURE_FILE_ICON 1 @@ -1024,7 +1024,7 @@ foreach_add_tag (const GstTagList * list, const gchar * tag, gpointer userdata) } GstBuffer * -gst_id3mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist, int version) +id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist, int version) { GstId3v2Tag tag; GstBuffer *buf; @@ -1172,7 +1172,7 @@ static const struct }; GstBuffer * -gst_id3mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist) +id3_mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist) { GstBuffer *buf = gst_buffer_new_and_alloc (ID3_V1_TAG_SIZE); guint8 *data = GST_BUFFER_DATA (buf); diff --git a/gst/id3tag/id3tag.h b/gst/id3tag/id3tag.h index 1fb59376..d5504969 100644 --- a/gst/id3tag/id3tag.h +++ b/gst/id3tag/id3tag.h @@ -24,9 +24,9 @@ G_BEGIN_DECLS #define ID3_VERSION_2_3 3 #define ID3_VERSION_2_4 4 -GstBuffer * gst_id3mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist, +GstBuffer * id3_mux_render_v2_tag (GstTagMux * mux, GstTagList * taglist, int version); -GstBuffer * gst_id3mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist); +GstBuffer * id3_mux_render_v1_tag (GstTagMux * mux, GstTagList * taglist); G_END_DECLS -- cgit v1.2.1