diff options
author | Wim Taymans <wim.taymans@gmail.com> | 2006-09-27 16:14:18 +0000 |
---|---|---|
committer | Wim Taymans <wim.taymans@gmail.com> | 2006-09-27 16:14:18 +0000 |
commit | 668add505e154984bcba8e7d4a0f7b7b0a3c3358 (patch) | |
tree | 297291334bc1ecfd766f0cea86fffcda10056cc9 /sys/v4l2/v4l2_calls.c | |
parent | 0b0c7f16f849d76c033c2e37c4d40ab2be513357 (diff) | |
download | gst-plugins-bad-668add505e154984bcba8e7d4a0f7b7b0a3c3358.tar.gz gst-plugins-bad-668add505e154984bcba8e7d4a0f7b7b0a3c3358.tar.bz2 gst-plugins-bad-668add505e154984bcba8e7d4a0f7b7b0a3c3358.zip |
Small cleanups.
Original commit message from CVS:
* sys/v4l2/gstv4l2object.c: (gst_v4l2_object_set_property_helper),
(gst_v4l2_set_defaults):
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_read),
(gst_v4l2src_create):
* sys/v4l2/gstv4l2xoverlay.c: (gst_v4l2_xoverlay_open):
* sys/v4l2/v4l2_calls.c: (gst_v4l2_get_capabilities),
(gst_v4l2_fill_lists), (gst_v4l2_open), (gst_v4l2_set_norm),
(gst_v4l2_get_frequency), (gst_v4l2_set_frequency),
(gst_v4l2_signal_strength), (gst_v4l2_get_attribute),
(gst_v4l2_set_attribute), (gst_v4l2_get_input),
(gst_v4l2_set_input):
* sys/v4l2/v4l2src_calls.c: (gst_v4l2src_fill_format_list),
(gst_v4l2src_grab_frame), (gst_v4l2src_get_capture),
(gst_v4l2src_set_capture), (gst_v4l2src_capture_init),
(gst_v4l2src_capture_start), (gst_v4l2src_capture_stop),
(gst_v4l2src_buffer_new):
* tests/icles/v4l2src-test.c: (my_bus_callback), (main):
Small cleanups.
Fix error messages.
Use locks when getting timestamps.
Fix leaks in test.
Add licensing header to tests.
Diffstat (limited to 'sys/v4l2/v4l2_calls.c')
-rw-r--r-- | sys/v4l2/v4l2_calls.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index 318508cf..6570517a 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -65,8 +65,8 @@ gst_v4l2_get_capabilities (GstV4l2Object * v4l2object) cap_failed: { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - (_("Error getting capabilities for device '%s':" - " It isn't a v4l2 driver. Check if it is a v4l1 driver"), + (_("Error getting capabilities for device '%s': " + "It isn't a v4l2 driver. Check if it is a v4l1 driver."), v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -99,7 +99,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; /* end of enumeration */ else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - ("Failed to get %d in input enumeration for %s", + (_("Failed to get %d in input enumeration for %s."), n, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -119,7 +119,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) vtun.index = input.tuner; if (ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &vtun) < 0) { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - ("Failed to get tuner %d settings on %s", + (_("Failed to get tuner %d settings on %s."), input.tuner, v4l2object->videodev), GST_ERROR_SYSTEM); g_object_unref (G_OBJECT (channel)); return FALSE; @@ -155,7 +155,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; /* end of enumeration */ else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - ("Failed to get %d in norm enumeration for %s", + (_("Failed to get %d in norm enumeration for %s."), n, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -197,7 +197,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; } else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - ("Failed to get %d in control enumeration for %s", + (_("Failed to get %d in control enumeration for %s."), n, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -266,7 +266,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; /* end of enumeration */ else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - ("Failed to get %d in menu enumeration for %s", + (_("Failed to get %d in menu enumeration for %s"), n, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -382,14 +382,14 @@ gst_v4l2_open (GstV4l2Object * v4l2object) stat_failed: { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, NOT_FOUND, - (_("Cannot identify device '%s'"), v4l2object->videodev), + (_("Cannot identify device '%s'."), v4l2object->videodev), GST_ERROR_SYSTEM); goto error; } no_device: { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, NOT_FOUND, - (_("This isn't a device '%s'"), v4l2object->videodev), + (_("This isn't a device '%s'."), v4l2object->videodev), GST_ERROR_SYSTEM); goto error; } @@ -498,7 +498,7 @@ gst_v4l2_set_norm (GstV4l2Object * v4l2object, v4l2_std_id norm) std_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to set norm 0x%llx for device %s: %s"), + (_("Failed to set norm 0x%llx for device %s: %s."), norm, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -535,7 +535,7 @@ gst_v4l2_get_frequency (GstV4l2Object * v4l2object, freq_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to get current tuner frequency for device %s"), + (_("Failed to get current tuner frequency for device %s."), v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -576,7 +576,7 @@ gst_v4l2_set_frequency (GstV4l2Object * v4l2object, freq_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to set current tuner frequency for device %s to %lu"), + (_("Failed to set current tuner frequency for device %s to %lu."), v4l2object->videodev, frequency), GST_ERROR_SYSTEM); return FALSE; } @@ -610,7 +610,7 @@ gst_v4l2_signal_strength (GstV4l2Object * v4l2object, tuner_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to get signal strength for device %s"), + (_("Failed to get signal strength for device %s."), v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -646,7 +646,7 @@ gst_v4l2_get_attribute (GstV4l2Object * v4l2object, ctrl_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to get value for control %d on device %s"), + (_("Failed to get value for control %d on device %s."), attribute_num, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -681,7 +681,7 @@ gst_v4l2_set_attribute (GstV4l2Object * v4l2object, ctrl_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to set value %d for control %d on device %s"), + (_("Failed to set value %d for control %d on device %s."), value, attribute_num, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -708,7 +708,7 @@ gst_v4l2_get_input (GstV4l2Object * v4l2object, gint * input) input_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to get current input on device %s"), + (_("Failed to get current input on device %s."), v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } @@ -731,7 +731,7 @@ gst_v4l2_set_input (GstV4l2Object * v4l2object, gint input) input_failed: { GST_ELEMENT_WARNING (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to set input %d on device %s"), + (_("Failed to set input %d on device %s."), input, v4l2object->videodev), GST_ERROR_SYSTEM); return FALSE; } |