From ea499266247b9a9c8339161d9f306543b4b5a8ff Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Wed, 19 Nov 2003 22:40:59 +0000 Subject: [PATCH] Removing have_size as it is in GstVideoSink higher class. Original commit message from CVS: Removing have_size as it is in GstVideoSink higher class. --- gst-libs/gst/interfaces/xoverlay.c | 32 +------------------------------- gst-libs/gst/interfaces/xoverlay.h | 4 ---- gst-libs/gst/xoverlay/xoverlay.c | 32 +------------------------------- gst-libs/gst/xoverlay/xoverlay.h | 4 ---- 4 files changed, 2 insertions(+), 70 deletions(-) diff --git a/gst-libs/gst/interfaces/xoverlay.c b/gst-libs/gst/interfaces/xoverlay.c index 53b4214..b4c737f 100644 --- a/gst-libs/gst/interfaces/xoverlay.c +++ b/gst-libs/gst/interfaces/xoverlay.c @@ -27,13 +27,12 @@ enum { HAVE_XWINDOW_ID, - HAVE_SIZE, LAST_SIGNAL }; static guint gst_x_overlay_signals[LAST_SIGNAL] = { 0 }; -static void gst_x_overlay_base_init (gpointer g_class); +static void gst_x_overlay_base_init (gpointer g_class); GType gst_x_overlay_get_type (void) @@ -70,14 +69,6 @@ gst_x_overlay_base_init (gpointer g_class) if (! initialized) { - gst_x_overlay_signals[HAVE_SIZE] = - g_signal_new ("have_size", - GST_TYPE_X_OVERLAY, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstXOverlayClass, have_size), - NULL, NULL, - gst_marshal_VOID__INT_INT, G_TYPE_NONE, 2, - G_TYPE_UINT, G_TYPE_UINT); - gst_x_overlay_signals[HAVE_XWINDOW_ID] = g_signal_new ("have_xwindow_id", GST_TYPE_X_OVERLAY, G_SIGNAL_RUN_LAST, @@ -127,24 +118,3 @@ gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, XID xwindow_id) g_signal_emit (G_OBJECT (overlay), gst_x_overlay_signals[HAVE_XWINDOW_ID], 0, xwindow_id); } - -/** - * gst_x_overlay_got_video_size: - * @overlay: a #GstXOverlay which received video geometry. - * @width: a width as a #gint. - * @height: a height as a #gint. - * - * This will fire an have_size signal. - * - * This function should be used by video overlay developpers. - */ -void -gst_x_overlay_got_video_size (GstXOverlay *overlay, - gint width, gint height) -{ - g_return_if_fail (overlay != NULL); - g_return_if_fail (GST_IS_X_OVERLAY (overlay)); - - g_signal_emit (G_OBJECT (overlay), gst_x_overlay_signals[HAVE_SIZE], - 0, width, height); -} diff --git a/gst-libs/gst/interfaces/xoverlay.h b/gst-libs/gst/interfaces/xoverlay.h index 1f8c9f3..65ac1dc 100644 --- a/gst-libs/gst/interfaces/xoverlay.h +++ b/gst-libs/gst/interfaces/xoverlay.h @@ -53,8 +53,6 @@ typedef struct _GstXOverlayClass { /* signals */ void (*have_xwindow_id) (GstXOverlay *overlay, XID xwindow_id); - void (*have_size) (GstXOverlay *overlay, gint width, gint height); - } GstXOverlayClass; GType gst_x_overlay_get_type (void); @@ -64,8 +62,6 @@ void gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id); /* public methods to fire signals */ void gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, XID xwindow_id); -void gst_x_overlay_got_video_size (GstXOverlay *overlay, - gint width, gint height); G_END_DECLS diff --git a/gst-libs/gst/xoverlay/xoverlay.c b/gst-libs/gst/xoverlay/xoverlay.c index 53b4214..b4c737f 100644 --- a/gst-libs/gst/xoverlay/xoverlay.c +++ b/gst-libs/gst/xoverlay/xoverlay.c @@ -27,13 +27,12 @@ enum { HAVE_XWINDOW_ID, - HAVE_SIZE, LAST_SIGNAL }; static guint gst_x_overlay_signals[LAST_SIGNAL] = { 0 }; -static void gst_x_overlay_base_init (gpointer g_class); +static void gst_x_overlay_base_init (gpointer g_class); GType gst_x_overlay_get_type (void) @@ -70,14 +69,6 @@ gst_x_overlay_base_init (gpointer g_class) if (! initialized) { - gst_x_overlay_signals[HAVE_SIZE] = - g_signal_new ("have_size", - GST_TYPE_X_OVERLAY, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GstXOverlayClass, have_size), - NULL, NULL, - gst_marshal_VOID__INT_INT, G_TYPE_NONE, 2, - G_TYPE_UINT, G_TYPE_UINT); - gst_x_overlay_signals[HAVE_XWINDOW_ID] = g_signal_new ("have_xwindow_id", GST_TYPE_X_OVERLAY, G_SIGNAL_RUN_LAST, @@ -127,24 +118,3 @@ gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, XID xwindow_id) g_signal_emit (G_OBJECT (overlay), gst_x_overlay_signals[HAVE_XWINDOW_ID], 0, xwindow_id); } - -/** - * gst_x_overlay_got_video_size: - * @overlay: a #GstXOverlay which received video geometry. - * @width: a width as a #gint. - * @height: a height as a #gint. - * - * This will fire an have_size signal. - * - * This function should be used by video overlay developpers. - */ -void -gst_x_overlay_got_video_size (GstXOverlay *overlay, - gint width, gint height) -{ - g_return_if_fail (overlay != NULL); - g_return_if_fail (GST_IS_X_OVERLAY (overlay)); - - g_signal_emit (G_OBJECT (overlay), gst_x_overlay_signals[HAVE_SIZE], - 0, width, height); -} diff --git a/gst-libs/gst/xoverlay/xoverlay.h b/gst-libs/gst/xoverlay/xoverlay.h index 1f8c9f3..65ac1dc 100644 --- a/gst-libs/gst/xoverlay/xoverlay.h +++ b/gst-libs/gst/xoverlay/xoverlay.h @@ -53,8 +53,6 @@ typedef struct _GstXOverlayClass { /* signals */ void (*have_xwindow_id) (GstXOverlay *overlay, XID xwindow_id); - void (*have_size) (GstXOverlay *overlay, gint width, gint height); - } GstXOverlayClass; GType gst_x_overlay_get_type (void); @@ -64,8 +62,6 @@ void gst_x_overlay_set_xwindow_id (GstXOverlay *overlay, XID xwindow_id); /* public methods to fire signals */ void gst_x_overlay_got_xwindow_id (GstXOverlay *overlay, XID xwindow_id); -void gst_x_overlay_got_video_size (GstXOverlay *overlay, - gint width, gint height); G_END_DECLS -- 2.7.4