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

gst/: s/BASESRC/BASE_SRC/g.

Browse source 
Original commit message from CVS:
2005-07-05  Andy Wingo  <wingo@pobox.com>

* gst/elements/gstfilesrc.c:
* gst/elements/gstfakesrc.c:
* gst/base/gstpushsrc.c:
* gst/base/gstbasesrc.h:
* gst/base/gstbasesrc.c: s/BASESRC/BASE_SRC/g.
This commit is contained in:
Andy Wingo 2005-07-05 16:38:13 +00:00
parent 5f536b32b4
commit 0675bff0fc
12 changed files with 98 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2005-07-05 Andy Wingo <wingo@pobox.com>
* gst/elements/gstfilesrc.c:
* gst/elements/gstfakesrc.c:
* gst/base/gstpushsrc.c:
* gst/base/gstbasesrc.h:
* gst/base/gstbasesrc.c: s/BASESRC/BASE_SRC/g.
2005-07-05 Stefan Kost <ensonic@users.sf.net> 2005-07-05 Stefan Kost <ensonic@users.sf.net>
* Makefile.am: * Makefile.am:

12
docs/gst/tmpl/gstbasesrc.sgml
View file

@ -73,8 +73,8 @@ GstBaseSrc
</para> </para>
@GST_BASESRC_STARTED: @GST_BASE_SRC_STARTED:
@GST_BASESRC_FLAG_LAST: @GST_BASE_SRC_FLAG_LAST:
<!-- ##### FUNCTION gst_base_src_is_live ##### --> <!-- ##### FUNCTION gst_base_src_is_live ##### -->
<para> <para>
@ -94,11 +94,3 @@ GstBaseSrc
@live: @live:
<!-- ##### MACRO GST_BASESRC_PAD ##### -->
<para>
</para>
@obj:

48
gst/base/gstbasesrc.c
View file

@ -180,7 +180,7 @@ gst_base_src_init (GstBaseSrc * basesrc, gpointer g_class)
basesrc->blocksize = DEFAULT_BLOCKSIZE; basesrc->blocksize = DEFAULT_BLOCKSIZE;
basesrc->clock_id = NULL; basesrc->clock_id = NULL;
GST_FLAG_UNSET (basesrc, GST_BASESRC_STARTED); GST_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED);
} }
void void
@ -222,7 +222,7 @@ gst_base_src_query (GstPad * pad, GstQuery * query)
gint64 i64; gint64 i64;
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (GST_PAD_PARENT (pad)); src = GST_BASE_SRC (GST_PAD_PARENT (pad));
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
@ -384,8 +384,8 @@ gst_base_src_event_handler (GstPad * pad, GstEvent * event)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result; gboolean result;
src = GST_BASESRC (GST_PAD_PARENT (pad)); src = GST_BASE_SRC (GST_PAD_PARENT (pad));
bclass = GST_BASESRC_GET_CLASS (src); bclass = GST_BASE_SRC_GET_CLASS (src);
if (bclass->event) if (bclass->event)
result = bclass->event (src, event); result = bclass->event (src, event);
@ -427,7 +427,7 @@ gst_base_src_set_property (GObject * object, guint prop_id,
{ {
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (object); src = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_BLOCKSIZE: case PROP_BLOCKSIZE:
@ -453,7 +453,7 @@ gst_base_src_get_property (GObject * object, guint prop_id, GValue * value,
{ {
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (object); src = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_BLOCKSIZE: case PROP_BLOCKSIZE:
@ -479,8 +479,8 @@ gst_base_src_get_range (GstPad * pad, guint64 offset, guint length,
GstBaseSrc *src; GstBaseSrc *src;
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
src = GST_BASESRC (GST_OBJECT_PARENT (pad)); src = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
bclass = GST_BASESRC_GET_CLASS (src); bclass = GST_BASE_SRC_GET_CLASS (src);
GST_LIVE_LOCK (src); GST_LIVE_LOCK (src);
if (src->is_live) { if (src->is_live) {
@ -492,7 +492,7 @@ gst_base_src_get_range (GstPad * pad, guint64 offset, guint length,
} }
GST_LIVE_UNLOCK (src); GST_LIVE_UNLOCK (src);
if (!GST_FLAG_IS_SET (src, GST_BASESRC_STARTED)) if (!GST_FLAG_IS_SET (src, GST_BASE_SRC_STARTED))
goto not_started; goto not_started;
if (!bclass->create) if (!bclass->create)
@ -542,9 +542,9 @@ gst_base_src_check_get_range (GstPad * pad)
{ {
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (GST_OBJECT_PARENT (pad)); src = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
if (!GST_FLAG_IS_SET (src, GST_BASESRC_STARTED)) { if (!GST_FLAG_IS_SET (src, GST_BASE_SRC_STARTED)) {
gst_base_src_start (src); gst_base_src_start (src);
gst_base_src_stop (src); gst_base_src_stop (src);
} }
@ -559,7 +559,7 @@ gst_base_src_loop (GstPad * pad)
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
GstFlowReturn ret; GstFlowReturn ret;
src = GST_BASESRC (GST_OBJECT_PARENT (pad)); src = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
ret = gst_base_src_get_range (pad, src->offset, src->blocksize, &buf); ret = gst_base_src_get_range (pad, src->offset, src->blocksize, &buf);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
@ -596,7 +596,7 @@ gst_base_src_unlock (GstBaseSrc * basesrc)
GST_DEBUG ("unlock"); GST_DEBUG ("unlock");
/* unblock whatever the subclass is doing */ /* unblock whatever the subclass is doing */
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->unlock) if (bclass->unlock)
result = bclass->unlock (basesrc); result = bclass->unlock (basesrc);
@ -619,7 +619,7 @@ gst_base_src_get_size (GstBaseSrc * basesrc, guint64 * size)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result = FALSE; gboolean result = FALSE;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->get_size) if (bclass->get_size)
result = bclass->get_size (basesrc, size); result = bclass->get_size (basesrc, size);
@ -634,7 +634,7 @@ gst_base_src_is_seekable (GstBaseSrc * basesrc)
{ {
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
/* check if we can seek */ /* check if we can seek */
if (bclass->is_seekable) if (bclass->is_seekable)
@ -651,10 +651,10 @@ gst_base_src_start (GstBaseSrc * basesrc)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result; gboolean result;
if (GST_FLAG_IS_SET (basesrc, GST_BASESRC_STARTED)) if (GST_FLAG_IS_SET (basesrc, GST_BASE_SRC_STARTED))
return TRUE; return TRUE;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->start) if (bclass->start)
result = bclass->start (basesrc); result = bclass->start (basesrc);
else else
@ -663,7 +663,7 @@ gst_base_src_start (GstBaseSrc * basesrc)
if (!result) if (!result)
goto could_not_start; goto could_not_start;
GST_FLAG_SET (basesrc, GST_BASESRC_STARTED); GST_FLAG_SET (basesrc, GST_BASE_SRC_STARTED);
/* start in the beginning */ /* start in the beginning */
basesrc->offset = 0; basesrc->offset = 0;
@ -713,15 +713,15 @@ gst_base_src_stop (GstBaseSrc * basesrc)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result = TRUE; gboolean result = TRUE;
if (!GST_FLAG_IS_SET (basesrc, GST_BASESRC_STARTED)) if (!GST_FLAG_IS_SET (basesrc, GST_BASE_SRC_STARTED))
return TRUE; return TRUE;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->stop) if (bclass->stop)
result = bclass->stop (basesrc); result = bclass->stop (basesrc);
if (result) if (result)
GST_FLAG_UNSET (basesrc, GST_BASESRC_STARTED); GST_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED);
return result; return result;
} }
@ -750,7 +750,7 @@ gst_base_src_activate_push (GstPad * pad, gboolean active)
{ {
GstBaseSrc *basesrc; GstBaseSrc *basesrc;
basesrc = GST_BASESRC (GST_OBJECT_PARENT (pad)); basesrc = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
/* prepare subclass first */ /* prepare subclass first */
if (active) { if (active) {
@ -774,7 +774,7 @@ gst_base_src_activate_pull (GstPad * pad, gboolean active)
{ {
GstBaseSrc *basesrc; GstBaseSrc *basesrc;
basesrc = GST_BASESRC (GST_OBJECT_PARENT (pad)); basesrc = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
/* prepare subclass first */ /* prepare subclass first */
if (active) { if (active) {
@ -806,7 +806,7 @@ gst_base_src_change_state (GstElement * element)
GstElementStateReturn presult; GstElementStateReturn presult;
GstElementState transition; GstElementState transition;
basesrc = GST_BASESRC (element); basesrc = GST_BASE_SRC (element);
transition = GST_STATE_TRANSITION (element); transition = GST_STATE_TRANSITION (element);

24
gst/base/gstbasesrc.h
View file

@ -28,17 +28,17 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_BASESRC (gst_base_src_get_type()) #define GST_TYPE_BASE_SRC (gst_base_src_get_type())
#define GST_BASESRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASESRC,GstBaseSrc)) #define GST_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SRC,GstBaseSrc))
#define GST_BASESRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASESRC,GstBaseSrcClass)) #define GST_BASE_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SRC,GstBaseSrcClass))
#define GST_BASESRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASESRC, GstBaseSrcClass)) #define GST_BASE_SRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SRC, GstBaseSrcClass))
#define GST_IS_BASESRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASESRC)) #define GST_IS_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SRC))
#define GST_IS_BASESRC_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASESRC)) #define GST_IS_BASE_SRC_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SRC))
typedef enum { typedef enum {
GST_BASESRC_STARTED = GST_ELEMENT_FLAG_LAST, GST_BASE_SRC_STARTED = GST_ELEMENT_FLAG_LAST,
GST_BASESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 GST_BASE_SRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2
} GstBaseSrcFlags; } GstBaseSrcFlags;
/* base class for random access sources /* base class for random access sources
@ -52,13 +52,13 @@ typedef enum {
typedef struct _GstBaseSrc GstBaseSrc; typedef struct _GstBaseSrc GstBaseSrc;
typedef struct _GstBaseSrcClass GstBaseSrcClass; typedef struct _GstBaseSrcClass GstBaseSrcClass;
#define GST_BASESRC_PAD(obj) (GST_BASESRC (obj)->srcpad) #define GST_BASE_SRC_PAD(obj) (GST_BASE_SRC (obj)->srcpad)
#define GST_LIVE_GET_LOCK(elem) (GST_BASESRC(elem)->live_lock) #define GST_LIVE_GET_LOCK(elem) (GST_BASE_SRC(elem)->live_lock)
#define GST_LIVE_LOCK(elem) g_mutex_lock(GST_LIVE_GET_LOCK(elem)) #define GST_LIVE_LOCK(elem) g_mutex_lock(GST_LIVE_GET_LOCK(elem))
#define GST_LIVE_TRYLOCK(elem) g_mutex_trylock(GST_LIVE_GET_LOCK(elem)) #define GST_LIVE_TRYLOCK(elem) g_mutex_trylock(GST_LIVE_GET_LOCK(elem))
#define GST_LIVE_UNLOCK(elem) g_mutex_unlock(GST_LIVE_GET_LOCK(elem)) #define GST_LIVE_UNLOCK(elem) g_mutex_unlock(GST_LIVE_GET_LOCK(elem))
#define GST_LIVE_GET_COND(elem) (GST_BASESRC(elem)->live_cond) #define GST_LIVE_GET_COND(elem) (GST_BASE_SRC(elem)->live_cond)
#define GST_LIVE_WAIT(elem) g_cond_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem)) #define GST_LIVE_WAIT(elem) g_cond_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem))
#define GST_LIVE_TIMED_WAIT(elem, timeval) g_cond_timed_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem),\ #define GST_LIVE_TIMED_WAIT(elem, timeval) g_cond_timed_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem),\
timeval) timeval)
@ -146,4 +146,4 @@ gboolean gst_base_src_is_live (GstBaseSrc *src);
G_END_DECLS G_END_DECLS
#endif /* __GST_BASESRC_H__ */ #endif /* __GST_BASE_SRC_H__ */

4
gst/base/gstpushsrc.c
View file

@ -71,7 +71,7 @@ gst_pushsrc_get_type (void)
(GInstanceInitFunc) gst_pushsrc_init, (GInstanceInitFunc) gst_pushsrc_init,
}; };
pushsrc_type = g_type_register_static (GST_TYPE_BASESRC, pushsrc_type = g_type_register_static (GST_TYPE_BASE_SRC,
"GstPushSrc", &pushsrc_info, G_TYPE_FLAG_ABSTRACT); "GstPushSrc", &pushsrc_info, G_TYPE_FLAG_ABSTRACT);
} }
return pushsrc_type; return pushsrc_type;
@ -101,7 +101,7 @@ gst_pushsrc_class_init (GstPushSrcClass * klass)
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
gstbasesrc_class = (GstBaseSrcClass *) klass; gstbasesrc_class = (GstBaseSrcClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASESRC); parent_class = g_type_class_ref (GST_TYPE_BASE_SRC);
gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_pushsrc_create); gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_pushsrc_create);
} }

10
gst/elements/gstfakesrc.c
View file

@ -180,7 +180,7 @@ gst_fakesrc_filltype_get_type (void)
#define _do_init(bla) \ #define _do_init(bla) \
GST_DEBUG_CATEGORY_INIT (gst_fakesrc_debug, "fakesrc", 0, "fakesrc element"); GST_DEBUG_CATEGORY_INIT (gst_fakesrc_debug, "fakesrc", 0, "fakesrc element");
GST_BOILERPLATE_FULL (GstFakeSrc, gst_fakesrc, GstBaseSrc, GST_TYPE_BASESRC, GST_BOILERPLATE_FULL (GstFakeSrc, gst_fakesrc, GstBaseSrc, GST_TYPE_BASE_SRC,
_do_init); _do_init);
static void gst_fakesrc_set_property (GObject * object, guint prop_id, static void gst_fakesrc_set_property (GObject * object, guint prop_id,
@ -369,7 +369,7 @@ gst_fakesrc_set_property (GObject * object, guint prop_id, const GValue * value,
GstBaseSrc *basesrc; GstBaseSrc *basesrc;
src = GST_FAKESRC (object); src = GST_FAKESRC (object);
basesrc = GST_BASESRC (object); basesrc = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_OUTPUT: case PROP_OUTPUT:
@ -428,11 +428,11 @@ gst_fakesrc_set_property (GObject * object, guint prop_id, const GValue * value,
src->dump = g_value_get_boolean (value); src->dump = g_value_get_boolean (value);
break; break;
case PROP_HAS_LOOP: case PROP_HAS_LOOP:
g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASESRC_STARTED)); g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASE_SRC_STARTED));
src->has_loop = g_value_get_boolean (value); src->has_loop = g_value_get_boolean (value);
break; break;
case PROP_HAS_GETRANGE: case PROP_HAS_GETRANGE:
g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASESRC_STARTED)); g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASE_SRC_STARTED));
src->has_getrange = g_value_get_boolean (value); src->has_getrange = g_value_get_boolean (value);
break; break;
case PROP_IS_LIVE: case PROP_IS_LIVE:
@ -454,7 +454,7 @@ gst_fakesrc_get_property (GObject * object, guint prop_id, GValue * value,
g_return_if_fail (GST_IS_FAKESRC (object)); g_return_if_fail (GST_IS_FAKESRC (object));
src = GST_FAKESRC (object); src = GST_FAKESRC (object);
basesrc = GST_BASESRC (object); basesrc = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_OUTPUT: case PROP_OUTPUT:

2
gst/elements/gstfilesrc.c
View file

@ -157,7 +157,7 @@ _do_init (GType filesrc_type)
GST_DEBUG_CATEGORY_INIT (gst_filesrc_debug, "filesrc", 0, "filesrc element"); GST_DEBUG_CATEGORY_INIT (gst_filesrc_debug, "filesrc", 0, "filesrc element");
} }
GST_BOILERPLATE_FULL (GstFileSrc, gst_filesrc, GstBaseSrc, GST_TYPE_BASESRC, GST_BOILERPLATE_FULL (GstFileSrc, gst_filesrc, GstBaseSrc, GST_TYPE_BASE_SRC,
_do_init); _do_init);
static void static void

48
libs/gst/base/gstbasesrc.c
View file

@ -180,7 +180,7 @@ gst_base_src_init (GstBaseSrc * basesrc, gpointer g_class)
basesrc->blocksize = DEFAULT_BLOCKSIZE; basesrc->blocksize = DEFAULT_BLOCKSIZE;
basesrc->clock_id = NULL; basesrc->clock_id = NULL;
GST_FLAG_UNSET (basesrc, GST_BASESRC_STARTED); GST_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED);
} }
void void
@ -222,7 +222,7 @@ gst_base_src_query (GstPad * pad, GstQuery * query)
gint64 i64; gint64 i64;
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (GST_PAD_PARENT (pad)); src = GST_BASE_SRC (GST_PAD_PARENT (pad));
switch (GST_QUERY_TYPE (query)) { switch (GST_QUERY_TYPE (query)) {
case GST_QUERY_POSITION: case GST_QUERY_POSITION:
@ -384,8 +384,8 @@ gst_base_src_event_handler (GstPad * pad, GstEvent * event)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result; gboolean result;
src = GST_BASESRC (GST_PAD_PARENT (pad)); src = GST_BASE_SRC (GST_PAD_PARENT (pad));
bclass = GST_BASESRC_GET_CLASS (src); bclass = GST_BASE_SRC_GET_CLASS (src);
if (bclass->event) if (bclass->event)
result = bclass->event (src, event); result = bclass->event (src, event);
@ -427,7 +427,7 @@ gst_base_src_set_property (GObject * object, guint prop_id,
{ {
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (object); src = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_BLOCKSIZE: case PROP_BLOCKSIZE:
@ -453,7 +453,7 @@ gst_base_src_get_property (GObject * object, guint prop_id, GValue * value,
{ {
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (object); src = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_BLOCKSIZE: case PROP_BLOCKSIZE:
@ -479,8 +479,8 @@ gst_base_src_get_range (GstPad * pad, guint64 offset, guint length,
GstBaseSrc *src; GstBaseSrc *src;
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
src = GST_BASESRC (GST_OBJECT_PARENT (pad)); src = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
bclass = GST_BASESRC_GET_CLASS (src); bclass = GST_BASE_SRC_GET_CLASS (src);
GST_LIVE_LOCK (src); GST_LIVE_LOCK (src);
if (src->is_live) { if (src->is_live) {
@ -492,7 +492,7 @@ gst_base_src_get_range (GstPad * pad, guint64 offset, guint length,
} }
GST_LIVE_UNLOCK (src); GST_LIVE_UNLOCK (src);
if (!GST_FLAG_IS_SET (src, GST_BASESRC_STARTED)) if (!GST_FLAG_IS_SET (src, GST_BASE_SRC_STARTED))
goto not_started; goto not_started;
if (!bclass->create) if (!bclass->create)
@ -542,9 +542,9 @@ gst_base_src_check_get_range (GstPad * pad)
{ {
GstBaseSrc *src; GstBaseSrc *src;
src = GST_BASESRC (GST_OBJECT_PARENT (pad)); src = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
if (!GST_FLAG_IS_SET (src, GST_BASESRC_STARTED)) { if (!GST_FLAG_IS_SET (src, GST_BASE_SRC_STARTED)) {
gst_base_src_start (src); gst_base_src_start (src);
gst_base_src_stop (src); gst_base_src_stop (src);
} }
@ -559,7 +559,7 @@ gst_base_src_loop (GstPad * pad)
GstBuffer *buf = NULL; GstBuffer *buf = NULL;
GstFlowReturn ret; GstFlowReturn ret;
src = GST_BASESRC (GST_OBJECT_PARENT (pad)); src = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
ret = gst_base_src_get_range (pad, src->offset, src->blocksize, &buf); ret = gst_base_src_get_range (pad, src->offset, src->blocksize, &buf);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
@ -596,7 +596,7 @@ gst_base_src_unlock (GstBaseSrc * basesrc)
GST_DEBUG ("unlock"); GST_DEBUG ("unlock");
/* unblock whatever the subclass is doing */ /* unblock whatever the subclass is doing */
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->unlock) if (bclass->unlock)
result = bclass->unlock (basesrc); result = bclass->unlock (basesrc);
@ -619,7 +619,7 @@ gst_base_src_get_size (GstBaseSrc * basesrc, guint64 * size)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result = FALSE; gboolean result = FALSE;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->get_size) if (bclass->get_size)
result = bclass->get_size (basesrc, size); result = bclass->get_size (basesrc, size);
@ -634,7 +634,7 @@ gst_base_src_is_seekable (GstBaseSrc * basesrc)
{ {
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
/* check if we can seek */ /* check if we can seek */
if (bclass->is_seekable) if (bclass->is_seekable)
@ -651,10 +651,10 @@ gst_base_src_start (GstBaseSrc * basesrc)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result; gboolean result;
if (GST_FLAG_IS_SET (basesrc, GST_BASESRC_STARTED)) if (GST_FLAG_IS_SET (basesrc, GST_BASE_SRC_STARTED))
return TRUE; return TRUE;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->start) if (bclass->start)
result = bclass->start (basesrc); result = bclass->start (basesrc);
else else
@ -663,7 +663,7 @@ gst_base_src_start (GstBaseSrc * basesrc)
if (!result) if (!result)
goto could_not_start; goto could_not_start;
GST_FLAG_SET (basesrc, GST_BASESRC_STARTED); GST_FLAG_SET (basesrc, GST_BASE_SRC_STARTED);
/* start in the beginning */ /* start in the beginning */
basesrc->offset = 0; basesrc->offset = 0;
@ -713,15 +713,15 @@ gst_base_src_stop (GstBaseSrc * basesrc)
GstBaseSrcClass *bclass; GstBaseSrcClass *bclass;
gboolean result = TRUE; gboolean result = TRUE;
if (!GST_FLAG_IS_SET (basesrc, GST_BASESRC_STARTED)) if (!GST_FLAG_IS_SET (basesrc, GST_BASE_SRC_STARTED))
return TRUE; return TRUE;
bclass = GST_BASESRC_GET_CLASS (basesrc); bclass = GST_BASE_SRC_GET_CLASS (basesrc);
if (bclass->stop) if (bclass->stop)
result = bclass->stop (basesrc); result = bclass->stop (basesrc);
if (result) if (result)
GST_FLAG_UNSET (basesrc, GST_BASESRC_STARTED); GST_FLAG_UNSET (basesrc, GST_BASE_SRC_STARTED);
return result; return result;
} }
@ -750,7 +750,7 @@ gst_base_src_activate_push (GstPad * pad, gboolean active)
{ {
GstBaseSrc *basesrc; GstBaseSrc *basesrc;
basesrc = GST_BASESRC (GST_OBJECT_PARENT (pad)); basesrc = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
/* prepare subclass first */ /* prepare subclass first */
if (active) { if (active) {
@ -774,7 +774,7 @@ gst_base_src_activate_pull (GstPad * pad, gboolean active)
{ {
GstBaseSrc *basesrc; GstBaseSrc *basesrc;
basesrc = GST_BASESRC (GST_OBJECT_PARENT (pad)); basesrc = GST_BASE_SRC (GST_OBJECT_PARENT (pad));
/* prepare subclass first */ /* prepare subclass first */
if (active) { if (active) {
@ -806,7 +806,7 @@ gst_base_src_change_state (GstElement * element)
GstElementStateReturn presult; GstElementStateReturn presult;
GstElementState transition; GstElementState transition;
basesrc = GST_BASESRC (element); basesrc = GST_BASE_SRC (element);
transition = GST_STATE_TRANSITION (element); transition = GST_STATE_TRANSITION (element);

24
libs/gst/base/gstbasesrc.h
View file

@ -28,17 +28,17 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_BASESRC (gst_base_src_get_type()) #define GST_TYPE_BASE_SRC (gst_base_src_get_type())
#define GST_BASESRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASESRC,GstBaseSrc)) #define GST_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_SRC,GstBaseSrc))
#define GST_BASESRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASESRC,GstBaseSrcClass)) #define GST_BASE_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_SRC,GstBaseSrcClass))
#define GST_BASESRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASESRC, GstBaseSrcClass)) #define GST_BASE_SRC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_BASE_SRC, GstBaseSrcClass))
#define GST_IS_BASESRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASESRC)) #define GST_IS_BASE_SRC(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_SRC))
#define GST_IS_BASESRC_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASESRC)) #define GST_IS_BASE_SRC_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_SRC))
typedef enum { typedef enum {
GST_BASESRC_STARTED = GST_ELEMENT_FLAG_LAST, GST_BASE_SRC_STARTED = GST_ELEMENT_FLAG_LAST,
GST_BASESRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2 GST_BASE_SRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2
} GstBaseSrcFlags; } GstBaseSrcFlags;
/* base class for random access sources /* base class for random access sources
@ -52,13 +52,13 @@ typedef enum {
typedef struct _GstBaseSrc GstBaseSrc; typedef struct _GstBaseSrc GstBaseSrc;
typedef struct _GstBaseSrcClass GstBaseSrcClass; typedef struct _GstBaseSrcClass GstBaseSrcClass;
#define GST_BASESRC_PAD(obj) (GST_BASESRC (obj)->srcpad) #define GST_BASE_SRC_PAD(obj) (GST_BASE_SRC (obj)->srcpad)
#define GST_LIVE_GET_LOCK(elem) (GST_BASESRC(elem)->live_lock) #define GST_LIVE_GET_LOCK(elem) (GST_BASE_SRC(elem)->live_lock)
#define GST_LIVE_LOCK(elem) g_mutex_lock(GST_LIVE_GET_LOCK(elem)) #define GST_LIVE_LOCK(elem) g_mutex_lock(GST_LIVE_GET_LOCK(elem))
#define GST_LIVE_TRYLOCK(elem) g_mutex_trylock(GST_LIVE_GET_LOCK(elem)) #define GST_LIVE_TRYLOCK(elem) g_mutex_trylock(GST_LIVE_GET_LOCK(elem))
#define GST_LIVE_UNLOCK(elem) g_mutex_unlock(GST_LIVE_GET_LOCK(elem)) #define GST_LIVE_UNLOCK(elem) g_mutex_unlock(GST_LIVE_GET_LOCK(elem))
#define GST_LIVE_GET_COND(elem) (GST_BASESRC(elem)->live_cond) #define GST_LIVE_GET_COND(elem) (GST_BASE_SRC(elem)->live_cond)
#define GST_LIVE_WAIT(elem) g_cond_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem)) #define GST_LIVE_WAIT(elem) g_cond_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem))
#define GST_LIVE_TIMED_WAIT(elem, timeval) g_cond_timed_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem),\ #define GST_LIVE_TIMED_WAIT(elem, timeval) g_cond_timed_wait (GST_LIVE_GET_COND (elem), GST_LIVE_GET_LOCK (elem),\
timeval) timeval)
@ -146,4 +146,4 @@ gboolean gst_base_src_is_live (GstBaseSrc *src);
G_END_DECLS G_END_DECLS
#endif /* __GST_BASESRC_H__ */ #endif /* __GST_BASE_SRC_H__ */

4
libs/gst/base/gstpushsrc.c
View file

@ -71,7 +71,7 @@ gst_pushsrc_get_type (void)
(GInstanceInitFunc) gst_pushsrc_init, (GInstanceInitFunc) gst_pushsrc_init,
}; };
pushsrc_type = g_type_register_static (GST_TYPE_BASESRC, pushsrc_type = g_type_register_static (GST_TYPE_BASE_SRC,
"GstPushSrc", &pushsrc_info, G_TYPE_FLAG_ABSTRACT); "GstPushSrc", &pushsrc_info, G_TYPE_FLAG_ABSTRACT);
} }
return pushsrc_type; return pushsrc_type;
@ -101,7 +101,7 @@ gst_pushsrc_class_init (GstPushSrcClass * klass)
gstelement_class = (GstElementClass *) klass; gstelement_class = (GstElementClass *) klass;
gstbasesrc_class = (GstBaseSrcClass *) klass; gstbasesrc_class = (GstBaseSrcClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_BASESRC); parent_class = g_type_class_ref (GST_TYPE_BASE_SRC);
gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_pushsrc_create); gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_pushsrc_create);
} }

10
plugins/elements/gstfakesrc.c
View file

@ -180,7 +180,7 @@ gst_fakesrc_filltype_get_type (void)
#define _do_init(bla) \ #define _do_init(bla) \
GST_DEBUG_CATEGORY_INIT (gst_fakesrc_debug, "fakesrc", 0, "fakesrc element"); GST_DEBUG_CATEGORY_INIT (gst_fakesrc_debug, "fakesrc", 0, "fakesrc element");
GST_BOILERPLATE_FULL (GstFakeSrc, gst_fakesrc, GstBaseSrc, GST_TYPE_BASESRC, GST_BOILERPLATE_FULL (GstFakeSrc, gst_fakesrc, GstBaseSrc, GST_TYPE_BASE_SRC,
_do_init); _do_init);
static void gst_fakesrc_set_property (GObject * object, guint prop_id, static void gst_fakesrc_set_property (GObject * object, guint prop_id,
@ -369,7 +369,7 @@ gst_fakesrc_set_property (GObject * object, guint prop_id, const GValue * value,
GstBaseSrc *basesrc; GstBaseSrc *basesrc;
src = GST_FAKESRC (object); src = GST_FAKESRC (object);
basesrc = GST_BASESRC (object); basesrc = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_OUTPUT: case PROP_OUTPUT:
@ -428,11 +428,11 @@ gst_fakesrc_set_property (GObject * object, guint prop_id, const GValue * value,
src->dump = g_value_get_boolean (value); src->dump = g_value_get_boolean (value);
break; break;
case PROP_HAS_LOOP: case PROP_HAS_LOOP:
g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASESRC_STARTED)); g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASE_SRC_STARTED));
src->has_loop = g_value_get_boolean (value); src->has_loop = g_value_get_boolean (value);
break; break;
case PROP_HAS_GETRANGE: case PROP_HAS_GETRANGE:
g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASESRC_STARTED)); g_return_if_fail (!GST_FLAG_IS_SET (object, GST_BASE_SRC_STARTED));
src->has_getrange = g_value_get_boolean (value); src->has_getrange = g_value_get_boolean (value);
break; break;
case PROP_IS_LIVE: case PROP_IS_LIVE:
@ -454,7 +454,7 @@ gst_fakesrc_get_property (GObject * object, guint prop_id, GValue * value,
g_return_if_fail (GST_IS_FAKESRC (object)); g_return_if_fail (GST_IS_FAKESRC (object));
src = GST_FAKESRC (object); src = GST_FAKESRC (object);
basesrc = GST_BASESRC (object); basesrc = GST_BASE_SRC (object);
switch (prop_id) { switch (prop_id) {
case PROP_OUTPUT: case PROP_OUTPUT:

2
plugins/elements/gstfilesrc.c
View file

@ -157,7 +157,7 @@ _do_init (GType filesrc_type)
GST_DEBUG_CATEGORY_INIT (gst_filesrc_debug, "filesrc", 0, "filesrc element"); GST_DEBUG_CATEGORY_INIT (gst_filesrc_debug, "filesrc", 0, "filesrc element");
} }
GST_BOILERPLATE_FULL (GstFileSrc, gst_filesrc, GstBaseSrc, GST_TYPE_BASESRC, GST_BOILERPLATE_FULL (GstFileSrc, gst_filesrc, GstBaseSrc, GST_TYPE_BASE_SRC,
_do_init); _do_init);
static void static void