From 58fee07b9531f7667ad3932e06d1acd635a53ae0 Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Sun, 21 Dec 2003 19:48:40 +0000 Subject: configure.ac: X_DISPLAY_MISSING is set to 1 if AC_PATH_XTRA fails to find X development files. I don't understand the... Original commit message from CVS: * configure.ac: X_DISPLAY_MISSING is set to 1 if AC_PATH_XTRA fails to find X development files. I don't understand the previous tests and they fail on my debian/ppc unstable. This one works. * examples/gstplay/player.c: (main): Set the pipeline to READY before exiting. * gst-libs/gst/play/gstplay.c: (gst_play_get_length_callback), (gst_play_set_video_sink), (gst_play_set_audio_sink), (gst_play_set_visualization): Add some safety checks in set_ methods and state_change. This was throwing some ugly CRITICAL messages when pipeline was getting disposed and casts were failing. --- ChangeLog | 13 +++++++++++++ configure.ac | 3 ++- examples/gstplay/player.c | 2 ++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5c3eb26d..5e6b59e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2003-12-21 Julien MOUTTE + + * configure.ac: X_DISPLAY_MISSING is set to 1 if AC_PATH_XTRA fails to + find X development files. I don't understand the previous tests and + they fail on my debian/ppc unstable. This one works. + * examples/gstplay/player.c: (main): Set the pipeline to READY before + exiting. + * gst-libs/gst/play/gstplay.c: (gst_play_get_length_callback), + (gst_play_set_video_sink), (gst_play_set_audio_sink), + (gst_play_set_visualization): Add some safety checks in set_ methods + and state_change. This was throwing some ugly CRITICAL messages when + pipeline was getting disposed and casts were failing. + 2003-12-21 Ronald Bultje * configure.ac: diff --git a/configure.ac b/configure.ac index 6055d3b8..b2d342ca 100644 --- a/configure.ac +++ b/configure.ac @@ -505,7 +505,8 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_X, true) GST_CHECK_FEATURE(X, [X libraries and plugins], [ximagesink], [ AC_PATH_XTRA - if test "x$X_CFLAGS" == "x" -o "$X_CFLAGS" == "-DX_DISPLAY_MISSING" +dnl if test "x$X_CFLAGS" == "x" -o "$X_CFLAGS" == "-DX_DISPLAY_MISSING" + if test "x$X_DISPLAY_MISSING" = "x1" then AC_MSG_NOTICE([cannot find X11 development files]) HAVE_X="no" diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c index 41fbb546..ef58e326 100644 --- a/examples/gstplay/player.c +++ b/examples/gstplay/player.c @@ -149,6 +149,8 @@ main (int argc, char *argv[]) g_main_loop_run (loop); + gst_element_set_state (GST_ELEMENT (play), GST_STATE_READY); + /* unref */ gst_object_unref (GST_OBJECT (play)); -- cgit