summaryrefslogtreecommitdiff
path: root/sys/v4l
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2010-09-05 22:17:47 (GMT)
committerDavid Schleef <ds@schleef.org>2010-09-15 07:10:23 (GMT)
commit6dc02137fb8e952c79479f0c1154831c1b761410 (patch)
treeea77f8d27b2a5b69b4fb2d72b3d76f8f0f0807e9 /sys/v4l
parentd71890156a33ea52b6e88b7c6222d150046f95f0 (diff)
downloadgst-plugins-base-6dc02137fb8e952c79479f0c1154831c1b761410.tar.gz
gst-plugins-base-6dc02137fb8e952c79479f0c1154831c1b761410.tar.xz
xoverlay: Add guintptr versions of functions
And deprecate the gulong versions. This is to support platforms where sizeof(unsigned long) < sizeof(void *). Fixes #627565. API: Add gst_x_overlay_set_window_handle() API: Deprecate: gst_x_overlay_set_xwindow_id() API: Add gst_x_overlay_got_window_handle() API: Deprecate: gst_x_overlay_got_xwindow_id() API: Add GstXOverlay::set_window_handle() API: Deprecate: GstXOverlay::set_xwindow_id()
Diffstat (limited to 'sys/v4l')
-rw-r--r--sys/v4l/gstv4lxoverlay.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/v4l/gstv4lxoverlay.c b/sys/v4l/gstv4lxoverlay.c
index cefb883..5867caf 100644
--- a/sys/v4l/gstv4lxoverlay.c
+++ b/sys/v4l/gstv4lxoverlay.c
@@ -46,14 +46,14 @@ struct _GstV4lXv
GMutex *mutex;
};
-static void gst_v4l_xoverlay_set_xwindow_id (GstXOverlay * overlay,
- XID xwindow_id);
+static void gst_v4l_xoverlay_set_window_handle (GstXOverlay * overlay,
+ guintptr xwindow_id);
void
gst_v4l_xoverlay_interface_init (GstXOverlayClass * klass)
{
/* default virtual functions */
- klass->set_xwindow_id = gst_v4l_xoverlay_set_xwindow_id;
+ klass->set_window_handle = gst_v4l_xoverlay_set_window_handle;
GST_DEBUG_CATEGORY_INIT (v4lxv_debug, "v4lxv", 0,
"V4L XOverlay interface debugging");
@@ -126,7 +126,7 @@ gst_v4l_xoverlay_open (GstV4lElement * v4lelement)
v4lelement->xv = v4lxv;
if (v4lelement->xwindow_id) {
- gst_v4l_xoverlay_set_xwindow_id (GST_X_OVERLAY (v4lelement),
+ gst_v4l_xoverlay_set_window_handle (GST_X_OVERLAY (v4lelement),
v4lelement->xwindow_id);
}
}
@@ -140,7 +140,7 @@ gst_v4l_xoverlay_close (GstV4lElement * v4lelement)
return;
if (v4lelement->xwindow_id) {
- gst_v4l_xoverlay_set_xwindow_id (GST_X_OVERLAY (v4lelement), 0);
+ gst_v4l_xoverlay_set_window_handle (GST_X_OVERLAY (v4lelement), 0);
}
XCloseDisplay (v4lxv->dpy);
@@ -189,8 +189,9 @@ idle_refresh (gpointer data)
}
static void
-gst_v4l_xoverlay_set_xwindow_id (GstXOverlay * overlay, XID xwindow_id)
+gst_v4l_xoverlay_set_window_handle (GstXOverlay * overlay, guintptr id)
{
+ XID xwindow_id = id;
GstV4lElement *v4lelement = GST_V4LELEMENT (overlay);
GstV4lXv *v4lxv;
XWindowAttributes attr;