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 /ext/sdl | |
| 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 'ext/sdl')
| -rw-r--r-- | ext/sdl/sdlvideosink.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c index 659c88c6..b7114267 100644 --- a/ext/sdl/sdlvideosink.c +++ b/ext/sdl/sdlvideosink.c @@ -44,8 +44,8 @@ static void gst_sdlvideosink_base_init (gpointer g_class); static void gst_sdlvideosink_class_init (GstSDLVideoSinkClass *klass); static void gst_sdlvideosink_init (GstSDLVideoSink *sdl); -static void gst_sdlvideosink_interface_init (GstInterfaceClass *klass); -static gboolean gst_sdlvideosink_interface_supported (GstInterface *iface, +static void gst_sdlvideosink_interface_init (GstImplementsInterfaceClass *klass); +static gboolean gst_sdlvideosink_supported (GstImplementsInterface *iface, GType type); static void gst_sdlvideosink_xoverlay_init (GstXOverlayClass *klass); @@ -115,7 +115,7 @@ gst_sdlvideosink_get_type (void) sdlvideosink_type = g_type_register_static(GST_TYPE_VIDEOSINK, "GstSDLVideoSink", &sdlvideosink_info, 0); - g_type_add_interface_static(sdlvideosink_type, GST_TYPE_INTERFACE, + g_type_add_interface_static(sdlvideosink_type, GST_TYPE_IMPLEMENTS_INTERFACE, &iface_info); g_type_add_interface_static(sdlvideosink_type, GST_TYPE_X_OVERLAY, &xoverlay_info); @@ -293,14 +293,14 @@ gst_sdlvideosink_init (GstSDLVideoSink *sdlvideosink) } static void -gst_sdlvideosink_interface_init (GstInterfaceClass *klass) +gst_sdlvideosink_interface_init (GstImplementsInterfaceClass *klass) { - klass->supported = gst_sdlvideosink_interface_supported; + klass->supported = gst_sdlvideosink_supported; } static gboolean -gst_sdlvideosink_interface_supported (GstInterface *interface, - GType iface_type) +gst_sdlvideosink_supported (GstImplementsInterface *interface, + GType iface_type) { g_assert (iface_type == GST_TYPE_X_OVERLAY); @@ -701,6 +701,5 @@ GST_PLUGIN_DEFINE ( plugin_init, VERSION, "LGPL", - GST_COPYRIGHT, GST_PACKAGE, GST_ORIGIN) |