mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

id3tag: change GType to GstId3Tag so it doesn't conflict with the id3tag plugin in -ugly

Browse source
This commit is contained in:
Tim-Philipp Müller 2009-05-22 09:51:29 +01:00
parent ae09a20cd0
commit fdaeae57c9
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/id3tag/gstid3tag.c
View file

@ -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);

12
gst/id3tag/gstid3tag.h
View file

@ -28,10 +28,10 @@
G_BEGIN_DECLS
typedef struct _GstID3Tag GstID3Tag;
typedef struct _GstID3TagClass GstID3TagClass;
typedef struct _GstId3Tag GstId3Tag;
typedef struct _GstId3TagClass GstId3TagClass;
struct _GstID3Tag {
struct _GstId3Tag {
GstTagMux tagmux;
gboolean write_v1;
@ -40,16 +40,16 @@ struct _GstID3Tag {
gint v2_major_version;
};
struct _GstID3TagClass {
struct _GstId3TagClass {
GstTagMuxClass tagmux_class;
};
#define GST_TYPE_ID3TAG \
(gst_id3tag_get_type())
#define GST_ID3TAG(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ID3TAG,GstID3Tag))
(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))
(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) \

6
gst/id3tag/gsttagmux.c
View file

@ -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 GstId3TagMux;
typedef GstTagMuxClass GstId3TagMuxClass;
GST_BOILERPLATE_FULL (GstID3TagMux, gst_tag_mux,
GST_BOILERPLATE_FULL (GstId3TagMux, gst_tag_mux,
GstElement, GST_TYPE_ELEMENT, gst_tag_mux_iface_init);