summaryrefslogtreecommitdiffstats
path: root/sys/v4l2/gstv4l2xoverlay.c
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sourceforge.net>2006-05-18 19:34:47 +0000
committerStefan Kost <ensonic@users.sourceforge.net>2006-05-18 19:34:47 +0000
commit957ad05fa6c44ef11181ffcaee1ccc4a03e5cb30 (patch)
tree22fcffeca841381e9e1f59141e378c8547f7e068 /sys/v4l2/gstv4l2xoverlay.c
parentfb76f0b1b59c1862521c174a57786b4e9373f415 (diff)
downloadgst-plugins-bad-957ad05fa6c44ef11181ffcaee1ccc4a03e5cb30.tar.gz
gst-plugins-bad-957ad05fa6c44ef11181ffcaee1ccc4a03e5cb30.tar.bz2
gst-plugins-bad-957ad05fa6c44ef11181ffcaee1ccc4a03e5cb30.zip
configure.ac: Check for X11
Original commit message from CVS: * configure.ac: Check for X11 * sys/v4l2/gstv4l2object.c: (gst_v4l2_class_probe_devices): * sys/v4l2/gstv4l2object.h: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_iface_supported): * sys/v4l2/gstv4l2src.h: * sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_open): * sys/v4l2/gstv4l2xoverlay.h: Code cleanups, fix debug macros
Diffstat (limited to 'sys/v4l2/gstv4l2xoverlay.c')
-rw-r--r--sys/v4l2/gstv4l2xoverlay.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/v4l2/gstv4l2xoverlay.c b/sys/v4l2/gstv4l2xoverlay.c
index bcf095e7..fa2154fa 100644
--- a/sys/v4l2/gstv4l2xoverlay.c
+++ b/sys/v4l2/gstv4l2xoverlay.c
@@ -46,6 +46,11 @@ struct _GstV4l2Xv
GST_DEBUG_CATEGORY_STATIC (v4l2xv_debug);
#define GST_CAT_DEFAULT v4l2xv_debug
+static void gst_v4l2_xoverlay_set_xwindow_id (GstV4l2Object * v4l2object,
+ XID xwindow_id);
+
+
+
void
gst_v4l2_xoverlay_interface_init (GstXOverlayClass * klass)
{
@@ -92,9 +97,9 @@ gst_v4l2_xoverlay_open (GstV4l2Object * v4l2object)
return;
}
if (fstat (v4l2object->video_fd, &s) < 0) {
- GST_ELEMENT_ERROR (v4l2object, RESOURCE, GST_RESOURCE_ERROR_NOT_FOUND,
- (_("Cannot identify '%s': %d, %s\n"),
- v4l2object->videodev, errno, strerror (errno)), GST_ERROR_SYSTEM);
+ GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, NOT_FOUND,
+ (_("Cannot identify '%s': %d, %s\n"), v4l2object->videodev, errno,
+ strerror (errno)), (NULL));
XCloseDisplay (dpy);
return;
}
@@ -112,7 +117,8 @@ gst_v4l2_xoverlay_open (GstV4l2Object * v4l2object)
XvFreeAdaptorInfo (ai);
if (id == 0) {
- GST_WARNING (v4l2object, "Did not find XvPortID for device - no overlay");
+ GST_WARNING_OBJECT (v4l2object->element,
+ "Did not find XvPortID for device - no overlay");
XCloseDisplay (dpy);
return;
}