From: Steve Baker Date: Fri, 7 Jun 2002 19:32:53 +0000 (+0000) Subject: file is opened in ready->paused rather than null->ready. this makes it easier to... X-Git-Tag: BRANCH-RELEASE-0_4_0-ROOT~82 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=075ca640225fac6ab7f144c6443fc0233886e8c9;p=platform%2Fupstream%2Fgstreamer.git file is opened in ready->paused rather than null->ready. this makes it easier to set the location more than once Original commit message from CVS: file is opened in ready->paused rather than null->ready. this makes it easier to set the location more than once --- diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c index cbd29a0..3fc7b50 100644 --- a/gst/elements/gstfilesrc.c +++ b/gst/elements/gstfilesrc.c @@ -644,19 +644,20 @@ gst_filesrc_change_state (GstElement *element) switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: + break; + case GST_STATE_READY_TO_NULL: + break; + case GST_STATE_READY_TO_PAUSED: if (!GST_FLAG_IS_SET (element, GST_FILESRC_OPEN)) { if (!gst_filesrc_open_file (GST_FILESRC (element))) return GST_STATE_FAILURE; } break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_PAUSED_TO_READY: if (GST_FLAG_IS_SET (element, GST_FILESRC_OPEN)) gst_filesrc_close_file (GST_FILESRC (element)); - break; - case GST_STATE_READY_TO_PAUSED: - case GST_STATE_PAUSED_TO_READY: - src->curoffset = 0; src->seek_happened = TRUE; + break; default: break; } diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index cbd29a0..3fc7b50 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -644,19 +644,20 @@ gst_filesrc_change_state (GstElement *element) switch (GST_STATE_TRANSITION (element)) { case GST_STATE_NULL_TO_READY: + break; + case GST_STATE_READY_TO_NULL: + break; + case GST_STATE_READY_TO_PAUSED: if (!GST_FLAG_IS_SET (element, GST_FILESRC_OPEN)) { if (!gst_filesrc_open_file (GST_FILESRC (element))) return GST_STATE_FAILURE; } break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_PAUSED_TO_READY: if (GST_FLAG_IS_SET (element, GST_FILESRC_OPEN)) gst_filesrc_close_file (GST_FILESRC (element)); - break; - case GST_STATE_READY_TO_PAUSED: - case GST_STATE_PAUSED_TO_READY: - src->curoffset = 0; src->seek_happened = TRUE; + break; default: break; }