diff options
| author | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-18 09:49:50 +0000 |
| commit | ef3ed344af7d0eb330f68c85d31acfa9471d1573 (patch) | |
| tree | 012d45187cfa98f972073142ce341190252e17f7 /gst-libs/gst/xoverlay | |
| parent | 70a4a0e00218745b2bf7ad0b145fe9a967981cb4 (diff) | |
| download | gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.gz gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.tar.bz2 gst-plugins-bad-ef3ed344af7d0eb330f68c85d31acfa9471d1573.zip | |
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Original commit message from CVS:
Merge HEAD from CAPS-ROOT to CAPS-MERGE-3
Diffstat (limited to 'gst-libs/gst/xoverlay')
| -rw-r--r-- | gst-libs/gst/xoverlay/xoverlay.c | 5 | ||||
| -rw-r--r-- | gst-libs/gst/xoverlay/xoverlay.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gst-libs/gst/xoverlay/xoverlay.c b/gst-libs/gst/xoverlay/xoverlay.c index b4c737ff..390453c1 100644 --- a/gst-libs/gst/xoverlay/xoverlay.c +++ b/gst-libs/gst/xoverlay/xoverlay.c @@ -56,7 +56,7 @@ gst_x_overlay_get_type (void) "GstXOverlay", &gst_x_overlay_info, 0); g_type_interface_add_prerequisite (gst_x_overlay_type, - GST_TYPE_INTERFACE); + GST_TYPE_IMPLEMENTS_INTERFACE); } return gst_x_overlay_type; @@ -65,6 +65,7 @@ gst_x_overlay_get_type (void) static void gst_x_overlay_base_init (gpointer g_class) { + GstXOverlayClass *overlay_class = (GstXOverlayClass *) g_class; static gboolean initialized = FALSE; if (! initialized) @@ -79,6 +80,8 @@ gst_x_overlay_base_init (gpointer g_class) initialized = TRUE; } + + overlay_class->set_xwindow_id = NULL; } /** diff --git a/gst-libs/gst/xoverlay/xoverlay.h b/gst-libs/gst/xoverlay/xoverlay.h index 65ac1dc7..062fadf4 100644 --- a/gst-libs/gst/xoverlay/xoverlay.h +++ b/gst-libs/gst/xoverlay/xoverlay.h @@ -31,11 +31,12 @@ G_BEGIN_DECLS #define GST_TYPE_X_OVERLAY \ (gst_x_overlay_get_type ()) #define GST_X_OVERLAY(obj) \ - (GST_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_X_OVERLAY, GstXOverlay)) + (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_X_OVERLAY, \ + GstXOverlay)) #define GST_X_OVERLAY_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_X_OVERLAY, GstXOverlayClass)) #define GST_IS_X_OVERLAY(obj) \ - (GST_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_X_OVERLAY)) + (GST_IMPLEMENTS_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_X_OVERLAY)) #define GST_IS_X_OVERLAY_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_X_OVERLAY)) #define GST_X_OVERLAY_GET_CLASS(inst) \ @@ -53,6 +54,8 @@ typedef struct _GstXOverlayClass { /* signals */ void (*have_xwindow_id) (GstXOverlay *overlay, XID xwindow_id); + + gpointer _gst_reserved[GST_PADDING]; } GstXOverlayClass; GType gst_x_overlay_get_type (void); |