gst-libs/gst/interfaces/xoverlay.*: Remove everything having to do with the desired size; add gst_x_overlay_prepare_x...

Original commit message from CVS:
* gst-libs/gst/interfaces/xoverlay.c: (gst_x_overlay_base_init),
(gst_x_overlay_got_xwindow_id), (gst_x_overlay_prepare_xwindow_id):
* gst-libs/gst/interfaces/xoverlay.h:
Remove everything having to do with the desired size; add
gst_x_overlay_prepare_xwindow_id() function; remove the
'have-xwindow-id' signal and make gst_x_overlay_got_xwindow_id()
post a message on the bus instead (#321816).
* sys/ximage/ximagesink.c: (gst_ximagesink_xoverlay_init):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_setcaps),
(gst_xvimagesink_xoverlay_init):
Remove desired size stuff (#321816).

2 files changed, 0 insertions, 25 deletions

diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index a14103cb..d59d934c 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -1583,16 +1583,6 @@ gst_ximagesink_set_xwindow_id (GstXOverlay * overlay, XID xwindow_id)
 }
 
 static void
-gst_ximagesink_get_desired_size (GstXOverlay * overlay,
-    guint * width, guint * height)
-{
-  GstXImageSink *ximagesink = GST_XIMAGESINK (overlay);
-
-  *width = GST_VIDEO_SINK_WIDTH (ximagesink);
-  *height = GST_VIDEO_SINK_HEIGHT (ximagesink);
-}
-
-static void
 gst_ximagesink_expose (GstXOverlay * overlay)
 {
   GstXImageSink *ximagesink = GST_XIMAGESINK (overlay);
@@ -1607,7 +1597,6 @@ static void
 gst_ximagesink_xoverlay_init (GstXOverlayClass * iface)
 {
   iface->set_xwindow_id = gst_ximagesink_set_xwindow_id;
-  iface->get_desired_size = gst_ximagesink_get_desired_size;
   iface->expose = gst_ximagesink_expose;
 }
 
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index 553ac399..2597f104 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1434,9 +1434,6 @@ gst_xvimagesink_setcaps (GstBaseSink * bsink, GstCaps * caps)
 
   xvimagesink->xcontext->im_format = im_format;
 
-  gst_x_overlay_got_desired_size (GST_X_OVERLAY (xvimagesink),
-      GST_VIDEO_SINK_WIDTH (xvimagesink), GST_VIDEO_SINK_HEIGHT (xvimagesink));
-
   return TRUE;
 }
 
@@ -1833,16 +1830,6 @@ gst_xvimagesink_set_xwindow_id (GstXOverlay * overlay, XID xwindow_id)
 }
 
 static void
-gst_xvimagesink_get_desired_size (GstXOverlay * overlay,
-    guint * width, guint * height)
-{
-  GstXvImageSink *xvimagesink = GST_XVIMAGESINK (overlay);
-
-  *width = GST_VIDEO_SINK_WIDTH (xvimagesink);
-  *height = GST_VIDEO_SINK_HEIGHT (xvimagesink);
-}
-
-static void
 gst_xvimagesink_expose (GstXOverlay * overlay)
 {
   XWindowAttributes attr;
@@ -1869,7 +1856,6 @@ static void
 gst_xvimagesink_xoverlay_init (GstXOverlayClass * iface)
 {
   iface->set_xwindow_id = gst_xvimagesink_set_xwindow_id;
-  iface->get_desired_size = gst_xvimagesink_get_desired_size;
   iface->expose = gst_xvimagesink_expose;
 }