sys/: Call gst_x_overlay_prepare_xwindow_id() to give applications a final chance...

Original commit message from CVS:
* sys/ximage/ximagesink.c: (gst_ximagesink_setcaps):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_setcaps):
Call gst_x_overlay_prepare_xwindow_id() to give applications
a final chance to set their own xwindow id before the video
sink creates its own window.

diff --git a/ChangeLog b/ChangeLog
index 458b585c52baace8000334b916ed8d8b00c17fb0..a0e567bbdd8c23a6e9651d02044bb9b969ad7fab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-22  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * sys/ximage/ximagesink.c: (gst_ximagesink_setcaps):
+       * sys/xvimage/xvimagesink.c: (gst_xvimagesink_setcaps):
+         Call gst_x_overlay_prepare_xwindow_id() to give applications
+         a final chance to set their own xwindow id before the video
+         sink creates its own window.
+
 2005-11-22  Julien MOUTTE  <julien@moutte.net>
 
        * sys/xvimage/xvimagesink.c:

diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 96e600d27ee2482883cc72d821758d3451f292b8..f9679b2dd11713ec325c5dc61c9da7b812041425 100644 (file)
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -1124,6 +1124,11 @@ gst_ximagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
   GST_VIDEO_SINK_HEIGHT (ximagesink) = new_height;
   ximagesink->framerate = fps;
 
+  /* Notify application to set xwindow id now */
+  if (!ximagesink->xwindow) {
+    gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (ximagesink));
+  }
+
   /* Creating our window and our image */
   g_assert (GST_VIDEO_SINK_WIDTH (ximagesink) > 0);
   g_assert (GST_VIDEO_SINK_HEIGHT (ximagesink) > 0);

diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 8313bd76ec532abf9e1fdcdee13cb02fb6afee99..8fa63a802f54ce67e85fbe9ac31636257a14c7e0 100644 (file)
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1503,6 +1503,11 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
   GST_DEBUG_OBJECT (xvimagesink, "scaling to %dx%d",
       GST_VIDEO_SINK_WIDTH (xvimagesink), GST_VIDEO_SINK_HEIGHT (xvimagesink));
 
+  /* Notify application to set xwindow id now */
+  if (!xvimagesink->xwindow) {
+    gst_x_overlay_prepare_xwindow_id (GST_X_OVERLAY (xvimagesink));
+  }
+
   /* Creating our window and our image with the display size in pixels */
   g_assert (GST_VIDEO_SINK_WIDTH (xvimagesink) > 0);
   g_assert (GST_VIDEO_SINK_HEIGHT (xvimagesink) > 0);