gst/gstpad.c: mark links as unengaged when unnegotiating instead of deactivating.

Original commit message from CVS:
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_link_unnegotiate):
mark links as unengaged when unnegotiating instead of deactivating.
This way pads aren't marked as unengaged when going PLAYING=>PAUSED
This commit is contained in:
Benjamin Otte 2004-05-08 14:50:12 +00:00
parent ca223e73e8
commit d83895c446
2 changed files with 7 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2004-05-08 Benjamin Otte <otte@gnome.org>
* gst/gstpad.c: (gst_pad_set_active), (gst_pad_link_unnegotiate):
mark links as unengaged when unnegotiating instead of deactivating.
This way pads aren't marked as unengaged when going PLAYING=>PAUSED
2004-05-08 Benjamin Otte <otte@gnome.org> 2004-05-08 Benjamin Otte <otte@gnome.org>
* docs/manual/helloworld.xml: * docs/manual/helloworld.xml:

View file

@ -456,7 +456,6 @@ gst_pad_set_active (GstPad * pad, gboolean active)
} }
link = GST_RPAD_LINK (realpad); link = GST_RPAD_LINK (realpad);
if (link) { if (link) {
link->engaged = FALSE;
if (link->temp_store) { if (link->temp_store) {
GST_CAT_INFO (GST_CAT_PADS, GST_CAT_INFO (GST_CAT_PADS,
"deleting cached buffer from bufpen of pad %s:%s", "deleting cached buffer from bufpen of pad %s:%s",
@ -2136,6 +2135,7 @@ gst_pad_link_unnegotiate (GstPadLink * link)
if (link->caps) { if (link->caps) {
gst_caps_free (link->caps); gst_caps_free (link->caps);
link->caps = NULL; link->caps = NULL;
link->engaged = FALSE;
if (GST_RPAD_LINK (link->srcpad) != link) { if (GST_RPAD_LINK (link->srcpad) != link) {
g_warning ("unnegotiating unset link"); g_warning ("unnegotiating unset link");
} else { } else {