From d83895c446d8e3ddab614b8ca98aba1d69ae5975 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@gnome.org>
Date: Sat, 8 May 2004 14:50:12 +0000
Subject: [PATCH] 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
---
 ChangeLog    | 6 ++++++
 gst/gstpad.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d70877564a..86bb7ebb05 100644
--- 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 4960b3f468..c4fc02fdea 100644
--- 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 {