diff --git a/gst/asfdemux/asfpacket.c b/gst/asfdemux/asfpacket.c index c7abe7a48e..e973a7e885 100644 --- a/gst/asfdemux/asfpacket.c +++ b/gst/asfdemux/asfpacket.c @@ -127,7 +127,7 @@ gst_asf_payload_queue_for_stream (GstASFDemux * demux, AsfPayload * payload, GST_DEBUG_OBJECT (demux, "first ts: %" GST_TIME_FORMAT, GST_TIME_ARGS (payload->ts)); demux->first_ts = payload->ts; - if (demux->push_mode) { + if (demux->streaming) { gst_segment_set_seek (&demux->segment, demux->segment.rate, GST_FORMAT_TIME, demux->segment.flags, GST_SEEK_TYPE_SET, demux->first_ts, GST_SEEK_TYPE_NONE, 0, NULL); @@ -145,7 +145,7 @@ gst_asf_payload_queue_for_stream (GstASFDemux * demux, AsfPayload * payload, } /* make timestamps start from 0 */ - if (!demux->push_mode) + if (!demux->streaming) payload->ts -= demux->first_ts; /* remove any incomplete payloads that will never be completed */ diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 2454c3bee2..e8432d5cf5 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -261,7 +261,6 @@ gst_asf_demux_activate_push (GstPad * sinkpad, gboolean active) demux = GST_ASF_DEMUX (GST_OBJECT_PARENT (sinkpad)); - demux->push_mode = TRUE; demux->state = GST_ASF_DEMUX_STATE_HEADER; demux->streaming = TRUE; @@ -274,7 +273,6 @@ gst_asf_demux_activate_pull (GstPad * pad, gboolean active) GstASFDemux *demux; demux = GST_ASF_DEMUX (GST_OBJECT_PARENT (pad)); - demux->push_mode = FALSE; if (active) { demux->state = GST_ASF_DEMUX_STATE_HEADER; @@ -466,7 +464,7 @@ gst_asf_demux_handle_seek_event (GstASFDemux * demux, GstEvent * event) accurate = ((flags & GST_SEEK_FLAG_ACCURATE) == GST_SEEK_FLAG_ACCURATE); keyunit_sync = ((flags & GST_SEEK_FLAG_KEY_UNIT) == GST_SEEK_FLAG_KEY_UNIT); - if (demux->push_mode) { + if (demux->streaming) { gst_event_ref (event); return gst_pad_push_event (demux->sinkpad, event); } diff --git a/gst/asfdemux/gstasfdemux.h b/gst/asfdemux/gstasfdemux.h index db4394d06d..92293b490c 100644 --- a/gst/asfdemux/gstasfdemux.h +++ b/gst/asfdemux/gstasfdemux.h @@ -171,7 +171,6 @@ struct _GstASFDemux { gboolean need_newsegment; /* do we need to send a new-segment event? */ gboolean segment_running; /* if we've started the current segment */ gboolean streaming; /* TRUE if we are operating chain-based */ - gboolean push_mode; /* are we operating in push_mode? */ /* Descrambler settings */ guint8 span;