Fixed the state change code in gstelement that broke with the conversion of the states to a bitfield.
Original commit message from CVS: Fixed the state change code in gstelement that broke with the conversion of the states to a bitfield.
This commit is contained in:
parent
78d88ab82e
commit
f5fb79c4ec
@ -773,8 +773,6 @@ gst_bin_iterate_func (GstBin *bin)
|
|||||||
static void
|
static void
|
||||||
gst_bin_eos_func (GstBin *bin, GstElement *element)
|
gst_bin_eos_func (GstBin *bin, GstElement *element)
|
||||||
{
|
{
|
||||||
g_print ("eos in bin \"%s\"\n", gst_element_get_name (GST_ELEMENT (bin)));
|
|
||||||
|
|
||||||
gst_element_signal_eos (GST_ELEMENT (bin));
|
gst_element_signal_eos (GST_ELEMENT (bin));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -442,8 +442,8 @@ gst_element_set_state (GstElement *element, GstElementState state)
|
|||||||
/* loop until the final requested state is set */
|
/* loop until the final requested state is set */
|
||||||
while (GST_STATE(element) != state) {
|
while (GST_STATE(element) != state) {
|
||||||
/* move the curpending state in the correct direction */
|
/* move the curpending state in the correct direction */
|
||||||
if (curpending < state) curpending++;
|
if (curpending < state) curpending<<=1;
|
||||||
else curpending--;
|
else curpending>>=1;
|
||||||
|
|
||||||
/* set the pending state variable */
|
/* set the pending state variable */
|
||||||
// FIXME: should probably check to see that we don't already have one
|
// FIXME: should probably check to see that we don't already have one
|
||||||
|
Loading…
x
Reference in New Issue
Block a user