mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix element_error

Browse source 
Original commit message from CVS:
fix element_error
This commit is contained in:
Thomas Vander Stichele 2004-01-19 18:22:57 +00:00
parent 5a2ceb9ba0
commit a9fe376339
2 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-01-19 Thomas Vander Stichele <thomas at apestaart dot org>
* sys/v4l/v4l-overlay_calls.c: (gst_v4l_set_overlay):
* sys/v4l2/v4l2-overlay_calls.c: (gst_v4l2_set_display),
(gst_v4l2_set_window), (gst_v4l2_enable_overlay):
fix element_error
2004-01-19 Thomas Vander Stichele <thomas at apestaart dot org> 2004-01-19 Thomas Vander Stichele <thomas at apestaart dot org>
* sys/v4l/v4l_calls.h: * sys/v4l/v4l_calls.h:

23
sys/v4l2/v4l2-overlay_calls.c
View file

@ -59,17 +59,17 @@ gst_v4l2_set_display (GstV4l2Element *v4l2element)
switch (system(buff)) { switch (system(buff)) {
case -1: case -1:
gst_element_error(GST_ELEMENT(v4l2element), gst_element_error (v4l2element, RESOURCE, FAILED,
"Could not start v4l-conf: %s", (_("Could not start v4l-conf")),
g_strerror(errno)); GST_ERROR_SYSTEM);
g_free(buff); g_free(buff);
return FALSE; return FALSE;
case 0: case 0:
break; break;
default: default:
gst_element_error(GST_ELEMENT(v4l2element), gst_element_error (v4l2element, RESOURCE, FAILED,
"v4l-conf failed to run correctly: %s", (_("Executing v4l-conf failed")),
g_strerror(errno)); GST_ERROR_SYSTEM);
g_free(buff); g_free(buff);
return FALSE; return FALSE;
} }
@ -112,9 +112,8 @@ gst_v4l2_set_window (GstElement *element,
fmt.fmt.win.bitmap = NULL; fmt.fmt.win.bitmap = NULL;
if (ioctl(v4l2element->video_fd, VIDIOC_S_FMT, &fmt) < 0) { if (ioctl(v4l2element->video_fd, VIDIOC_S_FMT, &fmt) < 0) {
gst_element_error(GST_ELEMENT(v4l2element), gst_element_error (v4l2element, RESOURCE, TOO_LAZY, NULL,
"Failed to set the video window on device %s: %s", ("Failed to set the video window: %s", g_strerror (errno)));
v4l2element->device, g_strerror(errno));
return FALSE; return FALSE;
} }
@ -139,9 +138,9 @@ gst_v4l2_enable_overlay (GstV4l2Element *v4l2element,
GST_V4L2_CHECK_OVERLAY(v4l2element); GST_V4L2_CHECK_OVERLAY(v4l2element);
if (ioctl(v4l2element->video_fd, VIDIOC_OVERLAY, &doit) < 0) { if (ioctl(v4l2element->video_fd, VIDIOC_OVERLAY, &doit) < 0) {
gst_element_error(GST_ELEMENT(v4l2element), gst_element_error (v4l2element, RESOURCE, TOO_LAZY, NULL,
"Failed to %s overlay display for device %s: %s", ("Failed to %s overlay display: %s",
enable?"enable":"disable", v4l2element->device, g_strerror(errno)); enable?"enable":"disable", g_strerror (errno)));
return FALSE; return FALSE;
} }