diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-08-27 18:22:45 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-09-04 14:57:51 +0200 |
| commit | f3fa6f6de00082b23a075d48e1c27590d0fdf76e (patch) | |
| tree | 0ad0118297dd95c09119daa925d8d72b86e0efa3 | |
| parent | 704b371944af64e53c96539f84195dfdfe32b873 (diff) | |
rmdemux: Don't use GST_FLOW_IS_FATAL() and GST_FLOW_IS_SUCCESS()
| -rw-r--r-- | gst/realmedia/rmdemux.c | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index 93603afa..2cc8c473 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -918,31 +918,29 @@ need_pause: rmdemux->segment_running = FALSE; gst_pad_pause_task (rmdemux->sinkpad); - if (GST_FLOW_IS_FATAL (ret) || ret == GST_FLOW_NOT_LINKED) { - if (ret == GST_FLOW_UNEXPECTED) { - /* perform EOS logic */ - if (rmdemux->segment.flags & GST_SEEK_FLAG_SEGMENT) { - gint64 stop; - - /* for segment playback we need to post when (in stream time) - * we stopped, this is either stop (when set) or the duration. */ - if ((stop = rmdemux->segment.stop) == -1) - stop = rmdemux->segment.duration; - - GST_LOG_OBJECT (rmdemux, "Sending segment done, at end of segment"); - gst_element_post_message (GST_ELEMENT (rmdemux), - gst_message_new_segment_done (GST_OBJECT (rmdemux), - GST_FORMAT_TIME, stop)); - } else { - /* normal playback, send EOS to all linked pads */ - GST_LOG_OBJECT (rmdemux, "Sending EOS, at end of stream"); - gst_rmdemux_send_event (rmdemux, gst_event_new_eos ()); - } + if (ret == GST_FLOW_UNEXPECTED) { + /* perform EOS logic */ + if (rmdemux->segment.flags & GST_SEEK_FLAG_SEGMENT) { + gint64 stop; + + /* for segment playback we need to post when (in stream time) + * we stopped, this is either stop (when set) or the duration. */ + if ((stop = rmdemux->segment.stop) == -1) + stop = rmdemux->segment.duration; + + GST_LOG_OBJECT (rmdemux, "Sending segment done, at end of segment"); + gst_element_post_message (GST_ELEMENT (rmdemux), + gst_message_new_segment_done (GST_OBJECT (rmdemux), + GST_FORMAT_TIME, stop)); } else { - GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED, - (NULL), ("stream stopped, reason %s", reason)); + /* normal playback, send EOS to all linked pads */ + GST_LOG_OBJECT (rmdemux, "Sending EOS, at end of stream"); gst_rmdemux_send_event (rmdemux, gst_event_new_eos ()); } + } else if (ret == GST_FLOW_NOT_LINKED || ret < GST_FLOW_UNEXPECTED) { + GST_ELEMENT_ERROR (rmdemux, STREAM, FAILED, + (NULL), ("stream stopped, reason %s", reason)); + gst_rmdemux_send_event (rmdemux, gst_event_new_eos ()); } return; } @@ -1890,7 +1888,7 @@ gst_rmdemux_combine_flows (GstRMDemux * rmdemux, GstRMDemuxStream * stream, stream->last_flow = ret; /* if it's success we can return the value right away */ - if (GST_FLOW_IS_SUCCESS (ret)) + if (ret == GST_FLOW_OK) goto done; /* any other error that is not-linked can be returned right |