From: Wim Taymans Date: Wed, 12 Oct 2005 12:58:55 +0000 (+0000) Subject: Some doc updates. X-Git-Tag: RELEASE-0_9_4~117 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c64fcb487bf19bbf52a1776d9ff8560db936aa04;p=platform%2Fupstream%2Fgstreamer.git Some doc updates. Original commit message from CVS: * docs/design/part-states.txt: * tools/gst-launch.c: (main): Some doc updates. Revert non-intentional change. --- diff --git a/ChangeLog b/ChangeLog index a0c3e4c..4496855 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2005-10-12 Wim Taymans + * docs/design/part-states.txt: + * tools/gst-launch.c: (main): + Some doc updates. + Revert non-intentional change. + +2005-10-12 Wim Taymans + * check/gst/gstbin.c: (GST_START_TEST): * check/gst/gstelement.c: (GST_START_TEST): * check/gst/gstevent.c: (GST_START_TEST), (test_event): diff --git a/docs/design/part-states.txt b/docs/design/part-states.txt index b1d6b63..5b49e2b 100644 --- a/docs/design/part-states.txt +++ b/docs/design/part-states.txt @@ -142,7 +142,7 @@ Getting state of elements ------------------------- The _get_state() function takes 3 arguments, two pointers that will hold the -current and pending state and one GTimeVal that holds a timeout value. The +current and pending state and one GstClockTime that holds a timeout value. The function returns a GstElementStateReturn. - If the element returned SUCCESS to the previous _set_state() function, this @@ -160,7 +160,7 @@ function returns a GstElementStateReturn. - If the element returned ASYNC to the previous _set_state() call, this function will wait for the element to complete its state change up to the amount of time - specified in the GTimeVal. + specified in the GstClockTime. * If the element does not complete the state change in the specified amount of time, this function will return ASYNC with the state set to the current state diff --git a/tools/gst-launch.c b/tools/gst-launch.c index 766af00..f15bdbe 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -624,12 +624,8 @@ main (int argc, char *argv[]) gst_bin_add (GST_BIN (real_pipeline), pipeline); pipeline = real_pipeline; } -#if 0 fprintf (stderr, _("PAUSE pipeline ...\n")); ret = gst_element_set_state (pipeline, GST_STATE_PAUSED); -#endif - fprintf (stderr, _("PLAYING pipeline ...\n")); - ret = gst_element_set_state (pipeline, GST_STATE_PLAYING); switch (ret) { case GST_STATE_CHANGE_FAILURE: