Don't update state if the peer event failed

Original commit message from CVS:
Don't update state if the peer event failed
This commit is contained in:
Wim Taymans 2002-06-02 15:34:34 +00:00
parent 816275f8ad
commit 74f97cd6f8
2 changed files with 32 additions and 22 deletions

View file

@ -523,6 +523,7 @@ static gboolean
gst_queue_handle_src_event (GstPad *pad, GstEvent *event) gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
{ {
GstQueue *queue; GstQueue *queue;
gboolean res = TRUE;
queue = GST_QUEUE (GST_OBJECT_PARENT (pad)); queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
@ -534,19 +535,23 @@ gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
return FALSE; return FALSE;
} }
res = gst_pad_event_default (pad, event);
if (res) {
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH: case GST_EVENT_FLUSH:
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n"); GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n");
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
break; break;
case GST_EVENT_SEEK: case GST_EVENT_SEEK:
if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH)
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
default: default:
gst_pad_event_default (pad, event);
break; break;
} }
}
g_mutex_unlock (queue->qlock); g_mutex_unlock (queue->qlock);
return TRUE;
return res;
} }
static gboolean static gboolean

View file

@ -523,6 +523,7 @@ static gboolean
gst_queue_handle_src_event (GstPad *pad, GstEvent *event) gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
{ {
GstQueue *queue; GstQueue *queue;
gboolean res = TRUE;
queue = GST_QUEUE (GST_OBJECT_PARENT (pad)); queue = GST_QUEUE (GST_OBJECT_PARENT (pad));
@ -534,19 +535,23 @@ gst_queue_handle_src_event (GstPad *pad, GstEvent *event)
return FALSE; return FALSE;
} }
res = gst_pad_event_default (pad, event);
if (res) {
switch (GST_EVENT_TYPE (event)) { switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_FLUSH: case GST_EVENT_FLUSH:
GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n"); GST_DEBUG_ELEMENT (GST_CAT_DATAFLOW, queue, "FLUSH event, flushing queue\n");
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
break; break;
case GST_EVENT_SEEK: case GST_EVENT_SEEK:
if (GST_EVENT_SEEK_FLAGS (event) & GST_SEEK_FLAG_FLUSH)
gst_queue_locked_flush (queue); gst_queue_locked_flush (queue);
default: default:
gst_pad_event_default (pad, event);
break; break;
} }
}
g_mutex_unlock (queue->qlock); g_mutex_unlock (queue->qlock);
return TRUE;
return res;
} }
static gboolean static gboolean