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

diff --git a/ChangeLog b/ChangeLog
index d70877564a2f78a5e64397070a6bc0e24123faaa..86bb7ebb05f638b05c22ccea1afa6be0dbd2c7e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * docs/manual/helloworld.xml:

diff --git a/gst/gstpad.c b/gst/gstpad.c
index 4960b3f468c772862927177880ef16fe276f4c8d..c4fc02fdeac9170a23b5c085b7a986b0879b7353 100644 (file)
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -456,7 +456,6 @@ gst_pad_set_active (GstPad * pad, gboolean active)
   }
   link = GST_RPAD_LINK (realpad);
   if (link) {
-    link->engaged = FALSE;
     if (link->temp_store) {
       GST_CAT_INFO (GST_CAT_PADS,
           "deleting cached buffer from bufpen of pad %s:%s",
@@ -2136,6 +2135,7 @@ gst_pad_link_unnegotiate (GstPadLink * link)
   if (link->caps) {
     gst_caps_free (link->caps);
     link->caps = NULL;
+    link->engaged = FALSE;
     if (GST_RPAD_LINK (link->srcpad) != link) {
       g_warning ("unnegotiating unset link");
     } else {