From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
Date: Wed, 11 Feb 2009 16:21:20 +0000 (+0100)
Subject: inputselector: Fix compilation, activate_sinkpad() has no notify parameter
X-Git-Tag: 1.19.3~507^2~19537
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=48dea2af6ee467c30be9e8616576d3b8f7e2f336;p=platform%2Fupstream%2Fgstreamer.git

inputselector: Fix compilation, activate_sinkpad() has no notify parameter
---

diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c
index 7fc4368..6184b65 100644
--- a/gst/selector/gstinputselector.c
+++ b/gst/selector/gstinputselector.c
@@ -342,14 +342,15 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
   gboolean forward = TRUE;
   GstInputSelector *sel;
   GstSelectorPad *selpad;
+  GstPad *prev_active_sinkpad;
   GstPad *active_sinkpad;
-  gboolean notify;
 
   sel = GST_INPUT_SELECTOR (gst_pad_get_parent (pad));
   selpad = GST_SELECTOR_PAD_CAST (pad);
 
   GST_INPUT_SELECTOR_LOCK (sel);
-  active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad, &notify);
+  prev_active_sinkpad = sel->active_sinkpad;
+  active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad);
 
   /* only forward if we are dealing with the active sinkpad or if select_all
    * is enabled */
@@ -357,7 +358,7 @@ gst_selector_pad_event (GstPad * pad, GstEvent * event)
     forward = FALSE;
   GST_INPUT_SELECTOR_UNLOCK (sel);
 
-  if (notify)
+  if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad)
     g_object_notify (G_OBJECT (sel), "active-pad");
 
   switch (GST_EVENT_TYPE (event)) {