diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2006-09-26 13:18:06 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2006-09-26 13:18:06 +0000 |
| commit | 65c2296d10a5a9b4566d1d506702a8c8ac8b79bb (patch) | |
| tree | 6bd101afd4764a50ba560df718288ba9ffe1699d /sys/v4l2/v4l2_calls.h | |
| parent | b90e11a094296aaae07ff496b8b7631d4c96134a (diff) | |
| download | gst-plugins-bad-65c2296d10a5a9b4566d1d506702a8c8ac8b79bb.tar.gz gst-plugins-bad-65c2296d10a5a9b4566d1d506702a8c8ac8b79bb.tar.bz2 gst-plugins-bad-65c2296d10a5a9b4566d1d506702a8c8ac8b79bb.zip | |
sys/v4l2/Makefile.am: Fix makefile, list libs in stack order.
Original commit message from CVS:
* sys/v4l2/Makefile.am:
Fix makefile, list libs in stack order.
* sys/v4l2/gstv4l2colorbalance.c:
* sys/v4l2/gstv4l2colorbalance.h:
* sys/v4l2/gstv4l2object.c: (gst_v4l2_device_get_type),
(gst_v4l2_object_install_properties_helper):
* sys/v4l2/gstv4l2object.h:
* sys/v4l2/gstv4l2src.c: (gst_v4l2src_get_read),
(gst_v4l2src_get_mmap), (gst_v4l2src_create):
* sys/v4l2/gstv4l2src.h:
* sys/v4l2/gstv4l2tuner.h:
* sys/v4l2/gstv4l2vidorient.h:
* sys/v4l2/gstv4l2xoverlay.h:
* sys/v4l2/v4l2_calls.h:
* sys/v4l2/v4l2src_calls.h:
Fix coding style:
- Remove extern from functions.
- Fix header indentation.
Fix Flags, add defaults for properties.
Remove unused enums.
Fix TOO_LAZY in error messages.
Diffstat (limited to 'sys/v4l2/v4l2_calls.h')
| -rw-r--r-- | sys/v4l2/v4l2_calls.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/v4l2/v4l2_calls.h b/sys/v4l2/v4l2_calls.h index f9f9ed20..5000cf21 100644 --- a/sys/v4l2/v4l2_calls.h +++ b/sys/v4l2/v4l2_calls.h @@ -43,7 +43,7 @@ #define GST_V4L2_CHECK_OPEN(v4l2object) \ if (!GST_V4L2_IS_OPEN(v4l2object)) \ { \ - GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, TOO_LAZY, \ + GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, \ (_("Device is not open.")), (NULL)); \ return FALSE; \ } @@ -52,7 +52,7 @@ #define GST_V4L2_CHECK_NOT_OPEN(v4l2object) \ if (GST_V4L2_IS_OPEN(v4l2object)) \ { \ - GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, TOO_LAZY, \ + GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, \ (_("Device is open.")), (NULL)); \ return FALSE; \ } @@ -61,7 +61,7 @@ #define GST_V4L2_CHECK_OVERLAY(v4l2object) \ if (!GST_V4L2_IS_OVERLAY(v4l2object)) \ { \ - GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, TOO_LAZY, \ + GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, \ (NULL), ("Device cannot handle overlay")); \ return FALSE; \ } |