From 82596fea62777745f9ae2525bcbc639f45f36238 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sun, 10 Jul 2005 12:03:13 +0000 Subject: [PATCH] more macro splitting Original commit message from CVS: more macro splitting --- ChangeLog | 22 +++++++++++++++++++ docs/gst/gstreamer-sections.txt | 44 ++++++++++++++++++------------------- docs/gst/tmpl/gstbasesink.sgml | 4 ++-- docs/gst/tmpl/gstbasesrc.sgml | 8 +++++++ gst/base/gstbasesink.c | 48 ++++++++++++++++++++--------------------- gst/base/gstbasesink.h | 22 +++++++++---------- gst/base/gstbasesrc.h | 4 ++-- gst/elements/gstfakesink.c | 6 +++--- gst/elements/gstfilesink.c | 8 +++---- libs/gst/base/gstbasesink.c | 48 ++++++++++++++++++++--------------------- libs/gst/base/gstbasesink.h | 22 +++++++++---------- libs/gst/base/gstbasesrc.h | 4 ++-- plugins/elements/gstfakesink.c | 6 +++--- plugins/elements/gstfilesink.c | 8 +++---- 14 files changed, 142 insertions(+), 112 deletions(-) diff --git a/ChangeLog b/ChangeLog index febd7aa..b7da1de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ 2005-07-10 Thomas Vander Stichele + * docs/gst/gstreamer-sections.txt: + * docs/gst/tmpl/gstbasesink.sgml: + * docs/gst/tmpl/gstbasesrc.sgml: + * gst/base/gstbasesink.c: (gst_base_sink_pad_getcaps), + (gst_base_sink_pad_setcaps), (gst_base_sink_pad_buffer_alloc), + (gst_base_sink_finalize), (gst_base_sink_set_clock), + (gst_base_sink_set_property), (gst_base_sink_get_property), + (gst_base_sink_handle_object), (gst_base_sink_event), + (gst_base_sink_do_sync), (gst_base_sink_handle_event), + (gst_base_sink_handle_buffer), (gst_base_sink_chain), + (gst_base_sink_loop), (gst_base_sink_deactivate), + (gst_base_sink_activate_push), (gst_base_sink_activate_pull), + (gst_base_sink_change_state): + * gst/base/gstbasesink.h: + * gst/base/gstbasesrc.h: + * gst/elements/gstfakesink.c: (gst_fakesink_get_times): + * gst/elements/gstfilesink.c: (gst_filesink_class_init), + (gst_filesink_init): + more macro splitting + +2005-07-10 Thomas Vander Stichele + * gst/gstelement.c: (gst_element_get_bus): add debug * tools/gst-launch.c: (check_intr), (event_loop): diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 40b8304..fa1d0ff 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1717,14 +1717,14 @@ GstBaseSrcFlags gst_base_src_is_live gst_base_src_set_live -GST_BASESRC_PAD +GST_BASE_SRC_PAD -GST_BASESRC -GST_IS_BASESRC -GST_TYPE_BASESRC -GST_BASESRC_CLASS -GST_IS_BASESRC_CLASS -GST_BASESRC_GET_CLASS +GST_BASE_SRC +GST_IS_BASE_SRC +GST_TYPE_BASE_SRC +GST_BASE_SRC_CLASS +GST_IS_BASE_SRC_CLASS +GST_BASE_SRC_GET_CLASS gst_base_src_get_type @@ -1736,17 +1736,17 @@ gst_base_src_get_type GstBaseSink GstBaseSinkClass -GST_BASESINK_CLOCK -GST_BASESINK_PAD +GST_BASE_SINK_CLOCK +GST_BASE_SINK_PAD GstBaseSinkClass -GST_BASESINK -GST_IS_BASESINK -GST_TYPE_BASESINK -GST_BASESINK_CLASS -GST_IS_BASESINK_CLASS -GST_BASESINK_GET_CLASS +GST_BASE_SINK +GST_IS_BASE_SINK +GST_TYPE_BASE_SINK +GST_BASE_SINK_CLASS +GST_IS_BASE_SINK_CLASS +GST_BASE_SINK_GET_CLASS gst_base_sink_get_type @@ -1757,12 +1757,12 @@ gst_base_sink_get_type GstBaseTransform GstBaseTransformClass -GST_BASETRANSFORM -GST_IS_BASETRANSFORM -GST_TYPE_BASETRANSFORM -GST_BASETRANSFORM_CLASS -GST_IS_BASETRANSFORM_CLASS -GST_BASETRANSFORM_GET_CLASS +GST_BASE_TRANSFORM +GST_IS_BASE_TRANSFORM +GST_TYPE_BASE_TRANSFORM +GST_BASE_TRANSFORM_CLASS +GST_IS_BASE_TRANSFORM_CLASS +GST_BASE_TRANSFORM_GET_CLASS -gst_basetransform_get_type +gst_base_transform_get_type diff --git a/docs/gst/tmpl/gstbasesink.sgml b/docs/gst/tmpl/gstbasesink.sgml index 7245684..4ba69f2 100644 --- a/docs/gst/tmpl/gstbasesink.sgml +++ b/docs/gst/tmpl/gstbasesink.sgml @@ -52,7 +52,7 @@ GstBaseSink @preroll: @render: - + @@ -60,7 +60,7 @@ GstBaseSink @obj: - + diff --git a/docs/gst/tmpl/gstbasesrc.sgml b/docs/gst/tmpl/gstbasesrc.sgml index c46bf02..f89f8b6 100644 --- a/docs/gst/tmpl/gstbasesrc.sgml +++ b/docs/gst/tmpl/gstbasesrc.sgml @@ -95,3 +95,11 @@ GstBaseSrc @live: + + + + + +@obj: + + diff --git a/gst/base/gstbasesink.c b/gst/base/gstbasesink.c index 046bf99..ae7d157 100644 --- a/gst/base/gstbasesink.c +++ b/gst/base/gstbasesink.c @@ -163,8 +163,8 @@ gst_base_sink_pad_getcaps (GstPad * pad) GstBaseSink *bsink; GstCaps *caps = NULL; - bsink = GST_BASESINK (GST_PAD_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (bsink); + bsink = GST_BASE_SINK (GST_PAD_PARENT (pad)); + bclass = GST_BASE_SINK_GET_CLASS (bsink); if (bclass->get_caps) caps = bclass->get_caps (bsink); @@ -188,8 +188,8 @@ gst_base_sink_pad_setcaps (GstPad * pad, GstCaps * caps) GstBaseSink *bsink; gboolean res = FALSE; - bsink = GST_BASESINK (GST_PAD_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (bsink); + bsink = GST_BASE_SINK (GST_PAD_PARENT (pad)); + bclass = GST_BASE_SINK_GET_CLASS (bsink); if (bclass->set_caps) res = bclass->set_caps (bsink, caps); @@ -205,8 +205,8 @@ gst_base_sink_pad_buffer_alloc (GstPad * pad, guint64 offset, guint size, GstBaseSink *bsink; GstFlowReturn result = GST_FLOW_OK; - bsink = GST_BASESINK (GST_PAD_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (bsink); + bsink = GST_BASE_SINK (GST_PAD_PARENT (pad)); + bclass = GST_BASE_SINK_GET_CLASS (bsink); if (bclass->buffer_alloc) result = bclass->buffer_alloc (bsink, offset, size, caps, buf); @@ -247,7 +247,7 @@ gst_base_sink_finalize (GObject * object) { GstBaseSink *basesink; - basesink = GST_BASESINK (object); + basesink = GST_BASE_SINK (object); g_queue_free (basesink->preroll_queue); @@ -283,7 +283,7 @@ gst_base_sink_set_clock (GstElement * element, GstClock * clock) { GstBaseSink *sink; - sink = GST_BASESINK (element); + sink = GST_BASE_SINK (element); sink->clock = clock; } @@ -294,7 +294,7 @@ gst_base_sink_set_property (GObject * object, guint prop_id, { GstBaseSink *sink; - sink = GST_BASESINK (object); + sink = GST_BASE_SINK (object); switch (prop_id) { case PROP_HAS_LOOP: @@ -327,7 +327,7 @@ gst_base_sink_get_property (GObject * object, guint prop_id, GValue * value, { GstBaseSink *sink; - sink = GST_BASESINK (object); + sink = GST_BASE_SINK (object); GST_LOCK (sink); switch (prop_id) { @@ -485,7 +485,7 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad, GstBaseSinkClass *bclass; GstFlowReturn pres; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); if (bclass->preroll) if ((pres = bclass->preroll (basesink, GST_BUFFER (obj))) != GST_FLOW_OK) @@ -618,9 +618,9 @@ gst_base_sink_event (GstPad * pad, GstEvent * event) gboolean result = TRUE; GstBaseSinkClass *bclass; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); GST_DEBUG ("event %p", event); @@ -729,7 +729,7 @@ gst_base_sink_do_sync (GstBaseSink * basesink, GstBuffer * buffer) GstClockTime start, end; GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); start = end = -1; if (bclass->get_times) bclass->get_times (basesink, buffer, &start, &end); @@ -802,7 +802,7 @@ gst_base_sink_handle_event (GstBaseSink * basesink, GstEvent * event) break; } - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); if (bclass->event) ret = bclass->event (basesink, event); else @@ -844,7 +844,7 @@ gst_base_sink_handle_buffer (GstBaseSink * basesink, GstBuffer * buf) gst_base_sink_do_sync (basesink, buf); - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); if (bclass->render) ret = bclass->render (basesink, buf); else @@ -862,7 +862,7 @@ gst_base_sink_chain (GstPad * pad, GstBuffer * buf) GstBaseSink *basesink; GstFlowReturn result; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); result = gst_base_sink_handle_object (basesink, pad, GST_MINI_OBJECT (buf)); @@ -878,7 +878,7 @@ gst_base_sink_loop (GstPad * pad) GstBuffer *buf = NULL; GstFlowReturn result; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); g_assert (basesink->pad_mode == GST_ACTIVATE_PULL); @@ -906,7 +906,7 @@ gst_base_sink_deactivate (GstBaseSink * basesink, GstPad * pad) gboolean result = FALSE; GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); /* step 1, unblock clock sync (if any) or any other blocking thing */ GST_PREROLL_LOCK (pad); @@ -937,7 +937,7 @@ gst_base_sink_activate_push (GstPad * pad, gboolean active) gboolean result = FALSE; GstBaseSink *basesink; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); if (active) { g_return_val_if_fail (basesink->has_chain, FALSE); @@ -957,7 +957,7 @@ gst_base_sink_activate_pull (GstPad * pad, gboolean active) gboolean result = FALSE; GstBaseSink *basesink; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); if (active) { /* if we have a scheduler we can start the task */ @@ -975,11 +975,11 @@ static GstElementStateReturn gst_base_sink_change_state (GstElement * element) { GstElementStateReturn ret = GST_STATE_SUCCESS; - GstBaseSink *basesink = GST_BASESINK (element); + GstBaseSink *basesink = GST_BASE_SINK (element); GstElementState transition = GST_STATE_TRANSITION (element); GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); switch (transition) { case GST_STATE_NULL_TO_READY: @@ -1028,7 +1028,7 @@ gst_base_sink_change_state (GstElement * element) { GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); GST_PREROLL_LOCK (basesink->sinkpad); GST_LOCK (basesink); diff --git a/gst/base/gstbasesink.h b/gst/base/gstbasesink.h index 336de29..312d7c4 100644 --- a/gst/base/gstbasesink.h +++ b/gst/base/gstbasesink.h @@ -20,23 +20,23 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __GST_BASESINK_H__ -#define __GST_BASESINK_H__ +#ifndef __GST_BASE_SINK_H__ +#define __GST_BASE_SINK_H__ #include G_BEGIN_DECLS -#define GST_TYPE_BASESINK (gst_base_sink_get_type()) -#define GST_BASESINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASESINK,GstBaseSink)) -#define GST_BASESINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASESINK,GstBaseSinkClass)) -#define GST_BASESINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASESINK, GstBaseSinkClass)) -#define GST_IS_BASESINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASESINK)) -#define GST_IS_BASESINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASESINK)) +#define GST_TYPE_BASE_SINK (gst_base_sink_get_type()) +#define GST_BASE_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SINK,GstBaseSink)) +#define GST_BASE_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SINK,GstBaseSinkClass)) +#define GST_BASE_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SINK, GstBaseSinkClass)) +#define GST_IS_BASE_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SINK)) +#define GST_IS_BASE_SINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SINK)) -#define GST_BASESINK_CLOCK(obj) (GST_BASESINK (obj)->clock) -#define GST_BASESINK_PAD(obj) (GST_BASESINK (obj)->sinkpad) +#define GST_BASE_SINK_CLOCK(obj) (GST_BASE_SINK (obj)->clock) +#define GST_BASE_SINK_PAD(obj) (GST_BASE_SINK (obj)->sinkpad) typedef struct _GstBaseSink GstBaseSink; typedef struct _GstBaseSinkClass GstBaseSinkClass; @@ -105,4 +105,4 @@ GType gst_base_sink_get_type(void); G_END_DECLS -#endif /* __GST_BASESINK_H__ */ +#endif /* __GST_BASE_SINK_H__ */ diff --git a/gst/base/gstbasesrc.h b/gst/base/gstbasesrc.h index a6d641d..245e6e4 100644 --- a/gst/base/gstbasesrc.h +++ b/gst/base/gstbasesrc.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __GST_BASESRC_H__ -#define __GST_BASESRC_H__ +#ifndef __GST_BASE_SRC_H__ +#define __GST_BASE_SRC_H__ #include diff --git a/gst/elements/gstfakesink.c b/gst/elements/gstfakesink.c index 2f69655..16eadfb 100644 --- a/gst/elements/gstfakesink.c +++ b/gst/elements/gstfakesink.c @@ -102,8 +102,8 @@ gst_fakesink_state_error_get_type (void) #define _do_init(bla) \ GST_DEBUG_CATEGORY_INIT (gst_fakesink_debug, "fakesink", 0, "fakesink element"); -GST_BOILERPLATE_FULL (GstFakeSink, gst_fakesink, GstBaseSink, GST_TYPE_BASESINK, - _do_init); +GST_BOILERPLATE_FULL (GstFakeSink, gst_fakesink, GstBaseSink, + GST_TYPE_BASE_SINK, _do_init); static void gst_fakesink_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); @@ -265,7 +265,7 @@ gst_fakesink_get_times (GstBaseSink * bsink, GstBuffer * buffer, GstFakeSink *sink = GST_FAKESINK (bsink); if (sink->sync) { - GST_BASESINK_CLASS (parent_class)->get_times (bsink, buffer, start, end); + GST_BASE_SINK_CLASS (parent_class)->get_times (bsink, buffer, start, end); } } diff --git a/gst/elements/gstfilesink.c b/gst/elements/gstfilesink.c index e5b8eba..d7a1ddd 100644 --- a/gst/elements/gstfilesink.c +++ b/gst/elements/gstfilesink.c @@ -104,8 +104,8 @@ _do_init (GType filesink_type) "filesink element"); } -GST_BOILERPLATE_FULL (GstFileSink, gst_filesink, GstBaseSink, GST_TYPE_BASESINK, - _do_init); +GST_BOILERPLATE_FULL (GstFileSink, gst_filesink, GstBaseSink, + GST_TYPE_BASE_SINK, _do_init); static void gst_filesink_base_init (gpointer g_class) @@ -122,7 +122,7 @@ static void gst_filesink_class_init (GstFileSinkClass * klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GstBaseSinkClass *gstbasesink_class = GST_BASESINK_CLASS (klass); + GstBaseSinkClass *gstbasesink_class = GST_BASE_SINK_CLASS (klass); gobject_class->set_property = gst_filesink_set_property; gobject_class->get_property = gst_filesink_get_property; @@ -142,7 +142,7 @@ gst_filesink_init (GstFileSink * filesink) { GstPad *pad; - pad = GST_BASESINK_PAD (filesink); + pad = GST_BASE_SINK_PAD (filesink); gst_pad_set_query_function (pad, gst_filesink_query); diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 046bf99..ae7d157 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -163,8 +163,8 @@ gst_base_sink_pad_getcaps (GstPad * pad) GstBaseSink *bsink; GstCaps *caps = NULL; - bsink = GST_BASESINK (GST_PAD_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (bsink); + bsink = GST_BASE_SINK (GST_PAD_PARENT (pad)); + bclass = GST_BASE_SINK_GET_CLASS (bsink); if (bclass->get_caps) caps = bclass->get_caps (bsink); @@ -188,8 +188,8 @@ gst_base_sink_pad_setcaps (GstPad * pad, GstCaps * caps) GstBaseSink *bsink; gboolean res = FALSE; - bsink = GST_BASESINK (GST_PAD_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (bsink); + bsink = GST_BASE_SINK (GST_PAD_PARENT (pad)); + bclass = GST_BASE_SINK_GET_CLASS (bsink); if (bclass->set_caps) res = bclass->set_caps (bsink, caps); @@ -205,8 +205,8 @@ gst_base_sink_pad_buffer_alloc (GstPad * pad, guint64 offset, guint size, GstBaseSink *bsink; GstFlowReturn result = GST_FLOW_OK; - bsink = GST_BASESINK (GST_PAD_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (bsink); + bsink = GST_BASE_SINK (GST_PAD_PARENT (pad)); + bclass = GST_BASE_SINK_GET_CLASS (bsink); if (bclass->buffer_alloc) result = bclass->buffer_alloc (bsink, offset, size, caps, buf); @@ -247,7 +247,7 @@ gst_base_sink_finalize (GObject * object) { GstBaseSink *basesink; - basesink = GST_BASESINK (object); + basesink = GST_BASE_SINK (object); g_queue_free (basesink->preroll_queue); @@ -283,7 +283,7 @@ gst_base_sink_set_clock (GstElement * element, GstClock * clock) { GstBaseSink *sink; - sink = GST_BASESINK (element); + sink = GST_BASE_SINK (element); sink->clock = clock; } @@ -294,7 +294,7 @@ gst_base_sink_set_property (GObject * object, guint prop_id, { GstBaseSink *sink; - sink = GST_BASESINK (object); + sink = GST_BASE_SINK (object); switch (prop_id) { case PROP_HAS_LOOP: @@ -327,7 +327,7 @@ gst_base_sink_get_property (GObject * object, guint prop_id, GValue * value, { GstBaseSink *sink; - sink = GST_BASESINK (object); + sink = GST_BASE_SINK (object); GST_LOCK (sink); switch (prop_id) { @@ -485,7 +485,7 @@ gst_base_sink_handle_object (GstBaseSink * basesink, GstPad * pad, GstBaseSinkClass *bclass; GstFlowReturn pres; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); if (bclass->preroll) if ((pres = bclass->preroll (basesink, GST_BUFFER (obj))) != GST_FLOW_OK) @@ -618,9 +618,9 @@ gst_base_sink_event (GstPad * pad, GstEvent * event) gboolean result = TRUE; GstBaseSinkClass *bclass; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); GST_DEBUG ("event %p", event); @@ -729,7 +729,7 @@ gst_base_sink_do_sync (GstBaseSink * basesink, GstBuffer * buffer) GstClockTime start, end; GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); start = end = -1; if (bclass->get_times) bclass->get_times (basesink, buffer, &start, &end); @@ -802,7 +802,7 @@ gst_base_sink_handle_event (GstBaseSink * basesink, GstEvent * event) break; } - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); if (bclass->event) ret = bclass->event (basesink, event); else @@ -844,7 +844,7 @@ gst_base_sink_handle_buffer (GstBaseSink * basesink, GstBuffer * buf) gst_base_sink_do_sync (basesink, buf); - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); if (bclass->render) ret = bclass->render (basesink, buf); else @@ -862,7 +862,7 @@ gst_base_sink_chain (GstPad * pad, GstBuffer * buf) GstBaseSink *basesink; GstFlowReturn result; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); result = gst_base_sink_handle_object (basesink, pad, GST_MINI_OBJECT (buf)); @@ -878,7 +878,7 @@ gst_base_sink_loop (GstPad * pad) GstBuffer *buf = NULL; GstFlowReturn result; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); g_assert (basesink->pad_mode == GST_ACTIVATE_PULL); @@ -906,7 +906,7 @@ gst_base_sink_deactivate (GstBaseSink * basesink, GstPad * pad) gboolean result = FALSE; GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); /* step 1, unblock clock sync (if any) or any other blocking thing */ GST_PREROLL_LOCK (pad); @@ -937,7 +937,7 @@ gst_base_sink_activate_push (GstPad * pad, gboolean active) gboolean result = FALSE; GstBaseSink *basesink; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); if (active) { g_return_val_if_fail (basesink->has_chain, FALSE); @@ -957,7 +957,7 @@ gst_base_sink_activate_pull (GstPad * pad, gboolean active) gboolean result = FALSE; GstBaseSink *basesink; - basesink = GST_BASESINK (GST_OBJECT_PARENT (pad)); + basesink = GST_BASE_SINK (GST_OBJECT_PARENT (pad)); if (active) { /* if we have a scheduler we can start the task */ @@ -975,11 +975,11 @@ static GstElementStateReturn gst_base_sink_change_state (GstElement * element) { GstElementStateReturn ret = GST_STATE_SUCCESS; - GstBaseSink *basesink = GST_BASESINK (element); + GstBaseSink *basesink = GST_BASE_SINK (element); GstElementState transition = GST_STATE_TRANSITION (element); GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); switch (transition) { case GST_STATE_NULL_TO_READY: @@ -1028,7 +1028,7 @@ gst_base_sink_change_state (GstElement * element) { GstBaseSinkClass *bclass; - bclass = GST_BASESINK_GET_CLASS (basesink); + bclass = GST_BASE_SINK_GET_CLASS (basesink); GST_PREROLL_LOCK (basesink->sinkpad); GST_LOCK (basesink); diff --git a/libs/gst/base/gstbasesink.h b/libs/gst/base/gstbasesink.h index 336de29..312d7c4 100644 --- a/libs/gst/base/gstbasesink.h +++ b/libs/gst/base/gstbasesink.h @@ -20,23 +20,23 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __GST_BASESINK_H__ -#define __GST_BASESINK_H__ +#ifndef __GST_BASE_SINK_H__ +#define __GST_BASE_SINK_H__ #include G_BEGIN_DECLS -#define GST_TYPE_BASESINK (gst_base_sink_get_type()) -#define GST_BASESINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASESINK,GstBaseSink)) -#define GST_BASESINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASESINK,GstBaseSinkClass)) -#define GST_BASESINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASESINK, GstBaseSinkClass)) -#define GST_IS_BASESINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASESINK)) -#define GST_IS_BASESINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASESINK)) +#define GST_TYPE_BASE_SINK (gst_base_sink_get_type()) +#define GST_BASE_SINK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SINK,GstBaseSink)) +#define GST_BASE_SINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SINK,GstBaseSinkClass)) +#define GST_BASE_SINK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SINK, GstBaseSinkClass)) +#define GST_IS_BASE_SINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SINK)) +#define GST_IS_BASE_SINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SINK)) -#define GST_BASESINK_CLOCK(obj) (GST_BASESINK (obj)->clock) -#define GST_BASESINK_PAD(obj) (GST_BASESINK (obj)->sinkpad) +#define GST_BASE_SINK_CLOCK(obj) (GST_BASE_SINK (obj)->clock) +#define GST_BASE_SINK_PAD(obj) (GST_BASE_SINK (obj)->sinkpad) typedef struct _GstBaseSink GstBaseSink; typedef struct _GstBaseSinkClass GstBaseSinkClass; @@ -105,4 +105,4 @@ GType gst_base_sink_get_type(void); G_END_DECLS -#endif /* __GST_BASESINK_H__ */ +#endif /* __GST_BASE_SINK_H__ */ diff --git a/libs/gst/base/gstbasesrc.h b/libs/gst/base/gstbasesrc.h index a6d641d..245e6e4 100644 --- a/libs/gst/base/gstbasesrc.h +++ b/libs/gst/base/gstbasesrc.h @@ -21,8 +21,8 @@ * Boston, MA 02111-1307, USA. */ -#ifndef __GST_BASESRC_H__ -#define __GST_BASESRC_H__ +#ifndef __GST_BASE_SRC_H__ +#define __GST_BASE_SRC_H__ #include diff --git a/plugins/elements/gstfakesink.c b/plugins/elements/gstfakesink.c index 2f69655..16eadfb 100644 --- a/plugins/elements/gstfakesink.c +++ b/plugins/elements/gstfakesink.c @@ -102,8 +102,8 @@ gst_fakesink_state_error_get_type (void) #define _do_init(bla) \ GST_DEBUG_CATEGORY_INIT (gst_fakesink_debug, "fakesink", 0, "fakesink element"); -GST_BOILERPLATE_FULL (GstFakeSink, gst_fakesink, GstBaseSink, GST_TYPE_BASESINK, - _do_init); +GST_BOILERPLATE_FULL (GstFakeSink, gst_fakesink, GstBaseSink, + GST_TYPE_BASE_SINK, _do_init); static void gst_fakesink_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); @@ -265,7 +265,7 @@ gst_fakesink_get_times (GstBaseSink * bsink, GstBuffer * buffer, GstFakeSink *sink = GST_FAKESINK (bsink); if (sink->sync) { - GST_BASESINK_CLASS (parent_class)->get_times (bsink, buffer, start, end); + GST_BASE_SINK_CLASS (parent_class)->get_times (bsink, buffer, start, end); } } diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c index e5b8eba..d7a1ddd 100644 --- a/plugins/elements/gstfilesink.c +++ b/plugins/elements/gstfilesink.c @@ -104,8 +104,8 @@ _do_init (GType filesink_type) "filesink element"); } -GST_BOILERPLATE_FULL (GstFileSink, gst_filesink, GstBaseSink, GST_TYPE_BASESINK, - _do_init); +GST_BOILERPLATE_FULL (GstFileSink, gst_filesink, GstBaseSink, + GST_TYPE_BASE_SINK, _do_init); static void gst_filesink_base_init (gpointer g_class) @@ -122,7 +122,7 @@ static void gst_filesink_class_init (GstFileSinkClass * klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GstBaseSinkClass *gstbasesink_class = GST_BASESINK_CLASS (klass); + GstBaseSinkClass *gstbasesink_class = GST_BASE_SINK_CLASS (klass); gobject_class->set_property = gst_filesink_set_property; gobject_class->get_property = gst_filesink_get_property; @@ -142,7 +142,7 @@ gst_filesink_init (GstFileSink * filesink) { GstPad *pad; - pad = GST_BASESINK_PAD (filesink); + pad = GST_BASE_SINK_PAD (filesink); gst_pad_set_query_function (pad, gst_filesink_query); -- 2.7.4