diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-02-11 17:21:20 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-12-31 00:53:49 +0000 |
| commit | ab025f08e73916324d8096be4c5d9a2695fc2413 (patch) | |
| tree | efef4a9ae30fd4455f8306a547477a2640edcab1 | |
| parent | 55637934d172ec845a85c677658825918f1359ac (diff) | |
inputselector: Fix compilation, activate_sinkpad() has no notify parameter
| -rw-r--r-- | plugins/elements/gstinputselector.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index 7fc43686c2..6184b65f2a 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/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, ¬ify); + 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)) { |