From 18fff8755de97c63eb856c4888f043ed40f01cd2 Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Fri, 8 Oct 2004 11:26:49 +0000 Subject: [PATCH] sys/: Reverting Ronald's changes as the issue is not coming from those elements. Moreover these elements should not k... Original commit message from CVS: 2004-10-08 Julien MOUTTE * sys/ximage/ximagesink.c: (gst_ximagesink_sink_link), (gst_ximagesink_set_xwindow_id), (gst_ximagesink_init): * sys/ximage/ximagesink.h: * sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link), (gst_xvimagesink_set_xwindow_id), (gst_xvimagesink_init): * sys/xvimage/xvimagesink.h: Reverting Ronald's changes as the issue is not coming from those elements. Moreover these elements should not keep the xid they have been given when in NULL state. --- ChangeLog | 11 +++++++++++ sys/ximage/ximagesink.c | 10 ++-------- sys/ximage/ximagesink.h | 1 - sys/xvimage/xvimagesink.c | 8 ++------ sys/xvimage/xvimagesink.h | 1 - 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e7ace5502..b82f2ca5d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-10-08 Julien MOUTTE + + * sys/ximage/ximagesink.c: (gst_ximagesink_sink_link), + (gst_ximagesink_set_xwindow_id), (gst_ximagesink_init): + * sys/ximage/ximagesink.h: + * sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link), + (gst_xvimagesink_set_xwindow_id), (gst_xvimagesink_init): + * sys/xvimage/xvimagesink.h: Reverting Ronald's changes as the issue is + not coming from those elements. Moreover these elements should not keep + the xid they have been given when in NULL state. + 2004-10-07 Ronald S. Bultje * sys/ximage/ximagesink.c: (gst_ximagesink_sink_link), diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index 53b94e2faf..1766be1f86 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -49,9 +49,6 @@ static void gst_ximagesink_buffer_free (GstBuffer * buffer); static void gst_ximagesink_ximage_destroy (GstXImageSink * ximagesink, GstXImage * ximage); -static void gst_ximagesink_set_xwindow_id (GstXOverlay * overlay, - XID xwindow_id); - /* ElementFactory information */ static GstElementDetails gst_ximagesink_details = GST_ELEMENT_DETAILS ("Video sink", @@ -991,8 +988,8 @@ gst_ximagesink_sink_link (GstPad * pad, const GstCaps * caps) g_assert (GST_VIDEOSINK_WIDTH (ximagesink) > 0); g_assert (GST_VIDEOSINK_HEIGHT (ximagesink) > 0); if (!ximagesink->xwindow) { - gst_ximagesink_set_xwindow_id (GST_X_OVERLAY (ximagesink), - ximagesink->parent); + ximagesink->xwindow = gst_ximagesink_xwindow_new (ximagesink, + GST_VIDEOSINK_WIDTH (ximagesink), GST_VIDEOSINK_HEIGHT (ximagesink)); } else { if (ximagesink->xwindow->internal) { gst_ximagesink_xwindow_resize (ximagesink, ximagesink->xwindow, @@ -1383,8 +1380,6 @@ gst_ximagesink_set_xwindow_id (GstXOverlay * overlay, XID xwindow_id) if (xwindow) ximagesink->xwindow = xwindow; - - ximagesink->parent = xwindow_id; } static void @@ -1539,7 +1534,6 @@ gst_ximagesink_init (GstXImageSink * ximagesink) gst_ximagesink_buffer_alloc); ximagesink->display_name = NULL; - ximagesink->parent = 0; ximagesink->xcontext = NULL; ximagesink->xwindow = NULL; ximagesink->ximage = NULL; diff --git a/sys/ximage/ximagesink.h b/sys/ximage/ximagesink.h index 3c9eaddd58..36c832a9e2 100644 --- a/sys/ximage/ximagesink.h +++ b/sys/ximage/ximagesink.h @@ -112,7 +112,6 @@ struct _GstXImageSink { char *display_name; - Drawable parent; GstXContext *xcontext; GstXWindow *xwindow; GstXImage *ximage; diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 5098584668..7dd72331eb 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -50,8 +50,6 @@ static void gst_xvimagesink_buffer_free (GstBuffer * buffer); static void gst_xvimagesink_xvimage_destroy (GstXvImageSink * xvimagesink, GstXvImage * xvimage); -static void gst_xvimagesink_set_xwindow_id (GstXOverlay * overlay, - XID xwindow_id); /* ElementFactory information */ static GstElementDetails gst_xvimagesink_details = @@ -1280,8 +1278,8 @@ gst_xvimagesink_sink_link (GstPad * pad, const GstCaps * caps) g_assert (GST_VIDEOSINK_WIDTH (xvimagesink) > 0); g_assert (GST_VIDEOSINK_HEIGHT (xvimagesink) > 0); if (!xvimagesink->xwindow) - gst_xvimagesink_set_xwindow_id (GST_X_OVERLAY (xvimagesink), - xvimagesink->parent); + xvimagesink->xwindow = gst_xvimagesink_xwindow_new (xvimagesink, + GST_VIDEOSINK_WIDTH (xvimagesink), GST_VIDEOSINK_HEIGHT (xvimagesink)); else { if (xvimagesink->xwindow->internal) gst_xvimagesink_xwindow_resize (xvimagesink, xvimagesink->xwindow, @@ -1644,7 +1642,6 @@ gst_xvimagesink_set_xwindow_id (GstXOverlay * overlay, XID xwindow_id) if (xwindow) xvimagesink->xwindow = xwindow; - xvimagesink->parent = xwindow_id; } static void @@ -1918,7 +1915,6 @@ gst_xvimagesink_init (GstXvImageSink * xvimagesink) gst_xvimagesink_buffer_alloc); xvimagesink->display_name = NULL; - xvimagesink->parent = 0; xvimagesink->xcontext = NULL; xvimagesink->xwindow = NULL; xvimagesink->xvimage = NULL; diff --git a/sys/xvimage/xvimagesink.h b/sys/xvimage/xvimagesink.h index 3c0ce05987..deb830f490 100644 --- a/sys/xvimage/xvimagesink.h +++ b/sys/xvimage/xvimagesink.h @@ -128,7 +128,6 @@ struct _GstXvImageSink { char *display_name; - Drawable parent; GstXContext *xcontext; GstXWindow *xwindow; GstXvImage *xvimage;