diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-05-22 09:51:29 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-05-22 09:51:29 +0100 |
| commit | fdaeae57c90ebd1fa001f398be6fec9050129781 (patch) | |
| tree | 647c39d9e904440a0844b382f61b9cdac60aa6d8 /gst/id3tag/gstid3tag.c | |
| parent | ae09a20cd011cc466def485cf8819ba7cf7e5cd7 (diff) | |
| download | gst-plugins-bad-fdaeae57c90ebd1fa001f398be6fec9050129781.tar.gz gst-plugins-bad-fdaeae57c90ebd1fa001f398be6fec9050129781.tar.bz2 gst-plugins-bad-fdaeae57c90ebd1fa001f398be6fec9050129781.zip | |
id3tag: change GType to GstId3Tag so it doesn't conflict with the id3tag plugin in -ugly
Diffstat (limited to 'gst/id3tag/gstid3tag.c')
| -rw-r--r-- | gst/id3tag/gstid3tag.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gst/id3tag/gstid3tag.c b/gst/id3tag/gstid3tag.c index f67d781f..98b05d0d 100644 --- a/gst/id3tag/gstid3tag.c +++ b/gst/id3tag/gstid3tag.c @@ -76,7 +76,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_ALWAYS, GST_STATIC_CAPS ("application/x-id3")); -GST_BOILERPLATE (GstID3Tag, gst_id3tag, GstTagMux, GST_TYPE_TAG_MUX); +GST_BOILERPLATE (GstId3Tag, gst_id3tag, GstTagMux, GST_TYPE_TAG_MUX); static GstBuffer *gst_id3tag_render_v2_tag (GstTagMux * mux, GstTagList * taglist); @@ -107,7 +107,7 @@ gst_id3tag_base_init (gpointer g_class) } static void -gst_id3tag_class_init (GstID3TagClass * klass) +gst_id3tag_class_init (GstId3TagClass * klass) { GObjectClass *gobject_class = (GObjectClass *) klass; @@ -137,7 +137,7 @@ gst_id3tag_class_init (GstID3TagClass * klass) } static void -gst_id3tag_init (GstID3Tag * id3mux, GstID3TagClass * id3mux_class) +gst_id3tag_init (GstId3Tag * id3mux, GstId3TagClass * id3mux_class) { id3mux->write_v1 = DEFAULT_WRITE_V1; id3mux->write_v2 = DEFAULT_WRITE_V2; @@ -149,7 +149,7 @@ static void gst_id3tag_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec) { - GstID3Tag *mux = GST_ID3TAG (object); + GstId3Tag *mux = GST_ID3TAG (object); switch (prop_id) { case ARG_WRITE_V1: @@ -171,7 +171,7 @@ static void gst_id3tag_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec) { - GstID3Tag *mux = GST_ID3TAG (object); + GstId3Tag *mux = GST_ID3TAG (object); switch (prop_id) { case ARG_WRITE_V1: @@ -192,7 +192,7 @@ gst_id3tag_get_property (GObject * object, guint prop_id, static GstBuffer * gst_id3tag_render_v2_tag (GstTagMux * mux, GstTagList * taglist) { - GstID3Tag *id3mux = GST_ID3TAG (mux); + GstId3Tag *id3mux = GST_ID3TAG (mux); if (id3mux->write_v2) return gst_id3mux_render_v2_tag (mux, taglist, id3mux->v2_major_version); @@ -203,7 +203,7 @@ gst_id3tag_render_v2_tag (GstTagMux * mux, GstTagList * taglist) static GstBuffer * gst_id3tag_render_v1_tag (GstTagMux * mux, GstTagList * taglist) { - GstID3Tag *id3mux = GST_ID3TAG (mux); + GstId3Tag *id3mux = GST_ID3TAG (mux); if (id3mux->write_v1) return gst_id3mux_render_v1_tag (mux, taglist); |