diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-02-11 17:21:20 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-02-11 17:21:20 +0100 |
| commit | 48dea2af6ee467c30be9e8616576d3b8f7e2f336 (patch) | |
| tree | 14bac9f81bf06b3d9c7dafcfb90e0ede7d26e0e6 /gst | |
| parent | b4c2d8c1bb8c31a9f1d3f86ed92cbb6e1e12be2a (diff) | |
| download | gst-plugins-bad-48dea2af6ee467c30be9e8616576d3b8f7e2f336.tar.gz gst-plugins-bad-48dea2af6ee467c30be9e8616576d3b8f7e2f336.tar.bz2 gst-plugins-bad-48dea2af6ee467c30be9e8616576d3b8f7e2f336.zip | |
inputselector: Fix compilation, activate_sinkpad() has no notify parameter
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/selector/gstinputselector.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gst/selector/gstinputselector.c b/gst/selector/gstinputselector.c index 7fc43686..6184b65f 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, ¬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)) { |