diff options
author | Edgard Lima <edgard.lima@indt.org.br> | 2006-05-01 21:37:51 +0000 |
---|---|---|
committer | Edgard Lima <edgard.lima@indt.org.br> | 2006-05-01 21:37:51 +0000 |
commit | 3281a636374c4baeab2cdbd31991744198cd62cf (patch) | |
tree | 852565c885a0d07ad64152eb1bced9a8338c5379 /sys/v4l2/gstv4l2xoverlay.c | |
parent | 9e8733719f54b7511cc6d66aa55a957b24921ded (diff) | |
download | gst-plugins-bad-3281a636374c4baeab2cdbd31991744198cd62cf.tar.gz gst-plugins-bad-3281a636374c4baeab2cdbd31991744198cd62cf.tar.bz2 gst-plugins-bad-3281a636374c4baeab2cdbd31991744198cd62cf.zip |
Few improvements to move to good.
Original commit message from CVS:
Few improvements to move to good.
Diffstat (limited to 'sys/v4l2/gstv4l2xoverlay.c')
-rw-r--r-- | sys/v4l2/gstv4l2xoverlay.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/sys/v4l2/gstv4l2xoverlay.c b/sys/v4l2/gstv4l2xoverlay.c index 66ea505c..8d597a45 100644 --- a/sys/v4l2/gstv4l2xoverlay.c +++ b/sys/v4l2/gstv4l2xoverlay.c @@ -71,30 +71,33 @@ gst_v4l2_xoverlay_open (GstV4l2Element * v4l2element) /* we need a display, obviously */ if (!name || !(dpy = XOpenDisplay (name))) { - GST_WARNING ("No $DISPLAY set or failed to open - no overlay"); + GST_WARNING_OBJECT (v4l2element, + "No $DISPLAY set or failed to open - no overlay"); return; } /* First let's check that XVideo extension is available */ if (!XQueryExtension (dpy, "XVideo", &i, &i, &i)) { - GST_WARNING ("Xv extension not available - no overlay"); + GST_WARNING_OBJECT (v4l2element, "Xv extension not available - no overlay"); XCloseDisplay (dpy); return; } /* find port that belongs to this device */ if (XvQueryExtension (dpy, &ver, &rel, &req, &ev, &err) != Success) { - GST_WARNING ("Xv extension not supported - no overlay"); + GST_WARNING_OBJECT (v4l2element, "Xv extension not supported - no overlay"); XCloseDisplay (dpy); return; } if (XvQueryAdaptors (dpy, DefaultRootWindow (dpy), &anum, &ai) != Success) { - GST_WARNING ("Failed to query Xv adaptors"); + GST_WARNING_OBJECT (v4l2element, "Failed to query Xv adaptors"); XCloseDisplay (dpy); return; } if (fstat (v4l2element->video_fd, &s) < 0) { - GST_ERROR ("Failed to stat() file descriptor: %s", g_strerror (errno)); + GST_ELEMENT_ERROR (v4l2element, RESOURCE, GST_RESOURCE_ERROR_NOT_FOUND, + (_("Cannot identify '%s': %d, %s\n"), + v4l2element->videodev, errno, strerror (errno)), GST_ERROR_SYSTEM); XCloseDisplay (dpy); return; } @@ -112,7 +115,7 @@ gst_v4l2_xoverlay_open (GstV4l2Element * v4l2element) XvFreeAdaptorInfo (ai); if (id == 0) { - GST_WARNING ("Did not find XvPortID for device - no overlay"); + GST_WARNING (v4l2element, "Did not find XvPortID for device - no overlay"); XCloseDisplay (dpy); return; } |