mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/gstpad.*: CONNECTED -> LINKED.

Browse source 
Original commit message from CVS:
* gst/gstpad.c: (gst_pad_alloc_buffer), (gst_pad_push),
(gst_pad_pull_range):
* gst/gstpad.h:
CONNECTED -> LINKED.
This commit is contained in:
Wim Taymans 2005-06-28 10:28:31 +00:00
parent f8e79bdf86
commit 9a6500143f
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-06-28 Wim Taymans <wim@fluendo.com>
* gst/gstpad.c: (gst_pad_alloc_buffer), (gst_pad_push),
(gst_pad_pull_range):
* gst/gstpad.h:
CONNECTED -> LINKED.
2005-06-28 Andy Wingo <wingo@pobox.com> 2005-06-28 Andy Wingo <wingo@pobox.com>
* *.c: Don't cast to GST_OBJECT when reffing or unreffing. Large * *.c: Don't cast to GST_OBJECT when reffing or unreffing. Large

10
gst/gstpad.c
View file

@ -2189,10 +2189,10 @@ no_peer:
{ {
/* pad has no peer */ /* pad has no peer */
GST_CAT_DEBUG (GST_CAT_PADS, GST_CAT_DEBUG (GST_CAT_PADS,
"%s:%s called bufferallocfunc but had no peer, returning NULL", "%s:%s called bufferallocfunc but had no peer",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
GST_UNLOCK (pad); GST_UNLOCK (pad);
return GST_FLOW_NOT_CONNECTED; return GST_FLOW_NOT_LINKED;
} }
flushing: flushing:
{ {
@ -2200,7 +2200,7 @@ flushing:
GST_UNLOCK (peer); GST_UNLOCK (peer);
gst_object_unref (peer); gst_object_unref (peer);
GST_CAT_DEBUG (GST_CAT_PADS, GST_CAT_DEBUG (GST_CAT_PADS,
"%s:%s called bufferallocfunc but peer was flushing, returning NULL", "%s:%s called bufferallocfunc but peer was flushing",
GST_DEBUG_PAD_NAME (pad)); GST_DEBUG_PAD_NAME (pad));
return GST_FLOW_WRONG_STATE; return GST_FLOW_WRONG_STATE;
} }
@ -2796,7 +2796,7 @@ not_linked:
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"pushing, but it was not linked"); "pushing, but it was not linked");
GST_UNLOCK (pad); GST_UNLOCK (pad);
return GST_FLOW_NOT_CONNECTED; return GST_FLOW_NOT_LINKED;
} }
} }
@ -2979,7 +2979,7 @@ not_connected:
GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad, GST_CAT_LOG_OBJECT (GST_CAT_SCHEDULING, pad,
"pulling range, but it was not linked"); "pulling range, but it was not linked");
GST_UNLOCK (pad); GST_UNLOCK (pad);
return GST_FLOW_NOT_CONNECTED; return GST_FLOW_NOT_LINKED;
} }
} }

2
gst/gstpad.h
View file

@ -75,7 +75,7 @@ typedef enum {
GST_FLOW_OK = 0, /* data passing was ok */ GST_FLOW_OK = 0, /* data passing was ok */
GST_FLOW_RESEND = 1, /* resend buffer, possibly with new caps */ GST_FLOW_RESEND = 1, /* resend buffer, possibly with new caps */
GST_FLOW_ERROR = -1, /* some (fatal) error occured */ GST_FLOW_ERROR = -1, /* some (fatal) error occured */
GST_FLOW_NOT_CONNECTED = -2, /* pad is not connected */ GST_FLOW_NOT_LINKED = -2, /* pad is not linked */
GST_FLOW_NOT_NEGOTIATED = -3, /* pad is not negotiated */ GST_FLOW_NOT_NEGOTIATED = -3, /* pad is not negotiated */
GST_FLOW_WRONG_STATE = -4, /* pad is in wrong state */ GST_FLOW_WRONG_STATE = -4, /* pad is in wrong state */
GST_FLOW_UNEXPECTED = -5, /* did not expect anything, this is not fatal */ GST_FLOW_UNEXPECTED = -5, /* did not expect anything, this is not fatal */