mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-11 18:05:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

revert accidental commit of cruft -- doh

Browse source 
Original commit message from CVS:
revert accidental commit of cruft -- doh
This commit is contained in:
Andy Wingo 2005-05-05 21:37:34 +00:00
parent 5bdcf5cbd3
commit e19563e43e
2 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/gstpad.c
View file

@ -2493,12 +2493,12 @@ gst_pad_load_and_link (xmlNodePtr self, GstObject * parent)
gchar *name = NULL; gchar *name = NULL;
while (field) { while (field) {
if (!strcmp ((char *) field->name, "name")) { if (!strcmp (field->name, "name")) {
name = (gchar *) xmlNodeGetContent (field); name = xmlNodeGetContent (field);
pad = gst_element_get_pad (GST_ELEMENT (parent), name); pad = gst_element_get_pad (GST_ELEMENT (parent), name);
g_free (name); g_free (name);
} else if (!strcmp ((char *) field->name, "peer")) { } else if (!strcmp (field->name, "peer")) {
peer = (gchar *) xmlNodeGetContent (field); peer = xmlNodeGetContent (field);
} }
field = field->next; field = field->next;
} }
@ -2562,8 +2562,7 @@ gst_pad_save_thyself (GstObject * object, xmlNodePtr parent)
realpad = GST_REAL_PAD (object); realpad = GST_REAL_PAD (object);
xmlNewChild (parent, NULL, (xmlChar *) "name", xmlNewChild (parent, NULL, "name", GST_PAD_NAME (realpad));
(xmlChar *) GST_PAD_NAME (realpad));
if (GST_RPAD_PEER (realpad) != NULL) { if (GST_RPAD_PEER (realpad) != NULL) {
gchar *content; gchar *content;
@ -2572,10 +2571,10 @@ gst_pad_save_thyself (GstObject * object, xmlNodePtr parent)
/* we just save it off */ /* we just save it off */
content = g_strdup_printf ("%s.%s", content = g_strdup_printf ("%s.%s",
GST_OBJECT_NAME (GST_PAD_PARENT (peer)), GST_PAD_NAME (peer)); GST_OBJECT_NAME (GST_PAD_PARENT (peer)), GST_PAD_NAME (peer));
xmlNewChild (parent, NULL, (xmlChar *) "peer", (xmlChar *) content); xmlNewChild (parent, NULL, "peer", content);
g_free (content); g_free (content);
} else } else
xmlNewChild (parent, NULL, (xmlChar *) "peer", (xmlChar *) ""); xmlNewChild (parent, NULL, "peer", "");
return parent; return parent;
} }
@ -2596,10 +2595,9 @@ gst_ghost_pad_save_thyself (GstPad * pad, xmlNodePtr parent)
g_return_val_if_fail (GST_IS_GHOST_PAD (pad), NULL); g_return_val_if_fail (GST_IS_GHOST_PAD (pad), NULL);
self = xmlNewChild (parent, NULL, (xmlChar *) "ghostpad", NULL); self = xmlNewChild (parent, NULL, "ghostpad", NULL);
xmlNewChild (self, NULL, (xmlChar *) "name", (xmlChar *) GST_PAD_NAME (pad)); xmlNewChild (self, NULL, "name", GST_PAD_NAME (pad));
xmlNewChild (self, NULL, (xmlChar *) "parent", xmlNewChild (self, NULL, "parent", GST_OBJECT_NAME (GST_PAD_PARENT (pad)));
(xmlChar *) GST_OBJECT_NAME (GST_PAD_PARENT (pad)));
/* FIXME FIXME FIXME! */ /* FIXME FIXME FIXME! */
@ -2779,7 +2777,7 @@ no_function:
* MT safe. * MT safe.
*/ */
gboolean gboolean
gst_pad_check_pull_range (GstPad * pad, gboolean * random_access) gst_pad_check_pull_range (GstPad * pad)
{ {
GstRealPad *peer; GstRealPad *peer;
gboolean ret; gboolean ret;
@ -2799,14 +2797,13 @@ gst_pad_check_pull_range (GstPad * pad, gboolean * random_access)
/* see note in above function */ /* see note in above function */
if (G_LIKELY ((checkgetrangefunc = peer->checkgetrangefunc) == NULL)) { if (G_LIKELY ((checkgetrangefunc = peer->checkgetrangefunc) == NULL)) {
*random_access = FALSE;
ret = GST_RPAD_GETRANGEFUNC (peer) != NULL; ret = GST_RPAD_GETRANGEFUNC (peer) != NULL;
} else { } else {
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"calling checkgetrangefunc %s of peer pad %s:%s", "calling checkgetrangefunc %s of peer pad %s:%s",
GST_DEBUG_FUNCPTR_NAME (checkgetrangefunc), GST_DEBUG_PAD_NAME (peer)); GST_DEBUG_FUNCPTR_NAME (checkgetrangefunc), GST_DEBUG_PAD_NAME (peer));
ret = checkgetrangefunc (GST_PAD_CAST (peer), random_access); ret = checkgetrangefunc (GST_PAD_CAST (peer));
} }
gst_object_unref (GST_OBJECT_CAST (peer)); gst_object_unref (GST_OBJECT_CAST (peer));
@ -2817,7 +2814,6 @@ gst_pad_check_pull_range (GstPad * pad, gboolean * random_access)
wrong_direction: wrong_direction:
{ {
GST_UNLOCK (pad); GST_UNLOCK (pad);
*random_access = FALSE;
return FALSE; return FALSE;
} }
not_connected: not_connected:
@ -2825,7 +2821,6 @@ not_connected:
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"checking pull range, but it was not linked"); "checking pull range, but it was not linked");
GST_UNLOCK (pad); GST_UNLOCK (pad);
*random_access = FALSE;
return FALSE; return FALSE;
} }
} }

5
gst/gstpad.h
View file

@ -114,7 +114,6 @@ typedef enum {
GST_ACTIVATE_NONE, GST_ACTIVATE_NONE,
GST_ACTIVATE_PUSH, GST_ACTIVATE_PUSH,
GST_ACTIVATE_PULL, GST_ACTIVATE_PULL,
GST_ACTIVATE_PULL_RANGE,
} GstActivateMode; } GstActivateMode;
#define GST_PAD_MODE_ACTIVATE(mode) ((mode) != GST_ACTIVATE_NONE) #define GST_PAD_MODE_ACTIVATE(mode) ((mode) != GST_ACTIVATE_NONE)
@ -139,7 +138,7 @@ typedef void (*GstPadLoopFunction) (GstPad *pad);
typedef GstFlowReturn (*GstPadChainFunction) (GstPad *pad, GstBuffer *buffer); typedef GstFlowReturn (*GstPadChainFunction) (GstPad *pad, GstBuffer *buffer);
typedef GstFlowReturn (*GstPadGetRangeFunction) (GstPad *pad, guint64 offset, typedef GstFlowReturn (*GstPadGetRangeFunction) (GstPad *pad, guint64 offset,
guint length, GstBuffer **buffer); guint length, GstBuffer **buffer);
typedef gboolean (*GstPadCheckGetRangeFunction) (GstPad *pad, gboolean *random_access); typedef gboolean (*GstPadCheckGetRangeFunction) (GstPad *pad);
typedef gboolean (*GstPadEventFunction) (GstPad *pad, GstEvent *event); typedef gboolean (*GstPadEventFunction) (GstPad *pad, GstEvent *event);
/* convert/query/format functions */ /* convert/query/format functions */
@ -524,7 +523,7 @@ GstCaps * gst_pad_get_negotiated_caps (GstPad * pad);
/* data passing functions */ /* data passing functions */
GstFlowReturn gst_pad_push (GstPad *pad, GstBuffer *buffer); GstFlowReturn gst_pad_push (GstPad *pad, GstBuffer *buffer);
gboolean gst_pad_check_pull_range (GstPad *pad, gboolean *random_access); gboolean gst_pad_check_pull_range (GstPad *pad);
GstFlowReturn gst_pad_pull_range (GstPad *pad, guint64 offset, guint size, GstFlowReturn gst_pad_pull_range (GstPad *pad, guint64 offset, guint size,
GstBuffer **buffer); GstBuffer **buffer);
gboolean gst_pad_push_event (GstPad *pad, GstEvent *event); gboolean gst_pad_push_event (GstPad *pad, GstEvent *event);