From: <za...@ke...> - 2007-05-17 11:05:34
|
CVS Root: /cvs/gstreamer Module: gst-phonon Changes by: zapek Date: Thu May 17 2007 11:05:23 UTC Log message: Fixed state change of path and output which wasn't applied to their pipeline leading to 'wrong-state' errors. Modified files: . : ChangeLog gst-phonon : gpho-abstractoutput.c gpho-mediaproducer.c gpho-path.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-phonon/ChangeLog.diff?r1=1.35&r2=1.36 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-phonon/gst-phonon/gpho-abstractoutput.c.diff?r1=1.4&r2=1.5 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-phonon/gst-phonon/gpho-mediaproducer.c.diff?r1=1.27&r2=1.28 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-phonon/gst-phonon/gpho-path.c.diff?r1=1.2&r2=1.3 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-phonon/ChangeLog,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- ChangeLog 16 May 2007 17:11:29 -0000 1.35 +++ ChangeLog 17 May 2007 11:05:11 -0000 1.36 @@ -1,3 +1,13 @@ +2007-05-17 David Gerber <david at fluendo dot com> + + * gst-phonon/gpho-abstractoutput.c: + (gpho_abstract_output_set_state), (gpho_abstract_output_get_state): + * gst-phonon/gpho-mediaproducer.c: + (gpho_media_producer_configure_element): + * gst-phonon/gpho-path.c: (gpho_path_set_state): + Fixed state change of path and output which wasn't applied to + their pipeline leading to 'wrong-state' errors. 2007-05-16 David Gerber <david at fluendo dot com> * gst-phonon/gpho-mediaproducer.c: (bus_handler), Index: gpho-abstractoutput.c RCS file: /cvs/gstreamer/gst-phonon/gst-phonon/gpho-abstractoutput.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- gpho-abstractoutput.c 9 May 2007 16:52:41 -0000 1.4 +++ gpho-abstractoutput.c 17 May 2007 11:05:11 -0000 1.5 @@ -266,9 +266,7 @@ { g_return_if_fail(GPHO_IS_ABSTRACT_OUTPUT(out)); - gst_element_set_state(out->priv->element, - state - ); + gst_element_set_state(out->priv->pipeline->pipeline, state); } guint gpho_abstract_output_get_state(GPhoAbstractOutput *out) @@ -276,7 +274,7 @@ GstState state; g_return_val_if_fail(GPHO_IS_ABSTRACT_OUTPUT(out), 0); - gst_element_get_state(out->priv->element, + gst_element_get_state(out->priv->pipeline->pipeline, &state, NULL, GST_CLOCK_TIME_NONE Index: gpho-mediaproducer.c RCS file: /cvs/gstreamer/gst-phonon/gst-phonon/gpho-mediaproducer.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- gpho-mediaproducer.c 16 May 2007 17:11:31 -0000 1.27 +++ gpho-mediaproducer.c 17 May 2007 11:05:11 -0000 1.28 @@ -935,9 +935,9 @@ /* configure a bus on the element to catch errors, metadata and EOS. */ gst_element_set_bus (element, prod->priv->bus); - /* preroll the element, this will signal the pad callback we installed above + /* preroll the pipeline and its element, this will signal the pad callback we installed above * and will figure out what the media is about. */ - ret = gst_element_set_state (element, GST_STATE_PAUSED); + ret = gst_element_set_state (prod->priv->pipeline->pipeline, GST_STATE_PAUSED); if (ret == GST_STATE_CHANGE_FAILURE) goto failed_state; Index: gpho-path.c RCS file: /cvs/gstreamer/gst-phonon/gst-phonon/gpho-path.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gpho-path.c 9 May 2007 16:52:41 -0000 1.2 +++ gpho-path.c 17 May 2007 11:05:11 -0000 1.3 @@ -667,5 +667,5 @@ g_assert(GPHO_IS_PATH(path)); - gst_element_set_state(path->priv->bin, state); + gst_element_set_state(path->priv->pipeline->pipeline, state); |