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.
This commit is contained in:
Wim Taymans 2005-10-12 12:58:55 +00:00
parent 6d0be74351
commit c64fcb487b
3 changed files with 9 additions and 6 deletions

View file

@ -1,3 +1,10 @@
2005-10-12 Wim Taymans <wim@fluendo.com>
* docs/design/part-states.txt:
* tools/gst-launch.c: (main):
Some doc updates.
Revert non-intentional change.
2005-10-12 Wim Taymans <wim@fluendo.com> 2005-10-12 Wim Taymans <wim@fluendo.com>
* check/gst/gstbin.c: (GST_START_TEST): * check/gst/gstbin.c: (GST_START_TEST):

View file

@ -142,7 +142,7 @@ Getting state of elements
------------------------- -------------------------
The _get_state() function takes 3 arguments, two pointers that will hold the 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. function returns a GstElementStateReturn.
- If the element returned SUCCESS to the previous _set_state() function, this - 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 - 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 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 * 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 time, this function will return ASYNC with the state set to the current state

View file

@ -624,12 +624,8 @@ main (int argc, char *argv[])
gst_bin_add (GST_BIN (real_pipeline), pipeline); gst_bin_add (GST_BIN (real_pipeline), pipeline);
pipeline = real_pipeline; pipeline = real_pipeline;
} }
#if 0
fprintf (stderr, _("PAUSE pipeline ...\n")); fprintf (stderr, _("PAUSE pipeline ...\n"));
ret = gst_element_set_state (pipeline, GST_STATE_PAUSED); 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) { switch (ret) {
case GST_STATE_CHANGE_FAILURE: case GST_STATE_CHANGE_FAILURE: