diff --git a/gst-libs/gst/signalprocessor/gstsignalprocessor.c b/gst-libs/gst/signalprocessor/gstsignalprocessor.c index 8de745de9a..c6dc89ae8d 100644 --- a/gst-libs/gst/signalprocessor/gstsignalprocessor.c +++ b/gst-libs/gst/signalprocessor/gstsignalprocessor.c @@ -488,8 +488,7 @@ gst_signal_processor_setcaps (GstPad * pad, GstCaps * caps) self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad)); - if (self->mode == GST_PAD_ACTIVATE_PULL - && !gst_caps_is_equal (caps, self->caps) + if (self->mode == GST_PAD_MODE_PULL && !gst_caps_is_equal (caps, self->caps) && !gst_signal_processor_setcaps_pull (self, pad, caps)) goto setcaps_pull_failed; @@ -1072,20 +1071,20 @@ gst_signal_processor_sink_activate_push (GstPad * pad, gboolean active) self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad)); if (active) { - if (self->mode == GST_PAD_ACTIVATE_NONE) { - self->mode = GST_PAD_ACTIVATE_PUSH; + if (self->mode == GST_PAD_MODE_NONE) { + self->mode = GST_PAD_MODE_PUSH; result = TRUE; - } else if (self->mode == GST_PAD_ACTIVATE_PUSH) { + } else if (self->mode == GST_PAD_MODE_PUSH) { result = TRUE; } else { g_warning ("foo"); result = FALSE; } } else { - if (self->mode == GST_PAD_ACTIVATE_NONE) { + if (self->mode == GST_PAD_MODE_NONE) { result = TRUE; - } else if (self->mode == GST_PAD_ACTIVATE_PUSH) { - self->mode = GST_PAD_ACTIVATE_NONE; + } else if (self->mode == GST_PAD_MODE_PUSH) { + self->mode = GST_PAD_MODE_NONE; result = TRUE; } else { g_warning ("foo"); @@ -1109,29 +1108,29 @@ gst_signal_processor_src_activate_pull (GstPad * pad, gboolean active) self = GST_SIGNAL_PROCESSOR (gst_pad_get_parent (pad)); if (active) { - if (self->mode == GST_PAD_ACTIVATE_NONE) { + if (self->mode == GST_PAD_MODE_NONE) { GList *l; for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next) result &= gst_pad_activate_pull (pad, active); if (result) - self->mode = GST_PAD_ACTIVATE_PULL; - } else if (self->mode == GST_PAD_ACTIVATE_PULL) { + self->mode = GST_PAD_MODE_PULL; + } else if (self->mode == GST_PAD_MODE_PULL) { result = TRUE; } else { g_warning ("foo"); result = FALSE; } } else { - if (self->mode == GST_PAD_ACTIVATE_NONE) { + if (self->mode == GST_PAD_MODE_NONE) { result = TRUE; - } else if (self->mode == GST_PAD_ACTIVATE_PULL) { + } else if (self->mode == GST_PAD_MODE_PULL) { GList *l; for (l = GST_ELEMENT (self)->sinkpads; l; l = l->next) result &= gst_pad_activate_pull (pad, active); if (result) - self->mode = GST_PAD_ACTIVATE_NONE; + self->mode = GST_PAD_MODE_NONE; result = TRUE; } else { g_warning ("foo"); diff --git a/gst-libs/gst/signalprocessor/gstsignalprocessor.h b/gst-libs/gst/signalprocessor/gstsignalprocessor.h index 402fe48549..b32c944350 100644 --- a/gst-libs/gst/signalprocessor/gstsignalprocessor.h +++ b/gst-libs/gst/signalprocessor/gstsignalprocessor.h @@ -82,7 +82,7 @@ struct _GstSignalProcessor { GstCaps *caps; GstSignalProcessorState state; GstFlowReturn flow_state; - GstPadActivateMode mode; + GstPadMode mode; /* pending inputs before processing can take place */ guint pending_in;