summaryrefslogtreecommitdiffstats
path: root/sys/v4l2/gstv4l2object.h
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/gstv4l2object.h
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/gstv4l2object.h')
-rw-r--r--sys/v4l2/gstv4l2object.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h
index 37552185..5692b26e 100644
--- a/sys/v4l2/gstv4l2object.h
+++ b/sys/v4l2/gstv4l2object.h
@@ -49,6 +49,8 @@
G_BEGIN_DECLS
+#define GST_V4L2OBJECT(obj) (GstV4l2Object *)(obj)
+
typedef struct _GstV4l2Object GstV4l2Object;
typedef struct _GstV4l2ObjectClassHelper GstV4l2ObjectClassHelper;
typedef struct _GstV4l2Xv GstV4l2Xv;
@@ -110,17 +112,14 @@ struct _GstV4l2ObjectClassHelper {
GType gst_v4l2object_get_type(void);
-#define OPEN_V4L2OBJECT_PROPS \
- enum { \
- PROP_0, \
- PROP_DEVICE, \
+#define V4L2_STD_OBJECT_PROPS \
+ PROP_DEVICE, \
PROP_DEVICE_NAME, \
PROP_FLAGS, \
PROP_STD, \
PROP_INPUT, \
PROP_FREQUENCY
-#define CLOSE_V4L2OBJECT_PROPS };
extern GstV4l2Object *
gst_v4l2object_new (GstElement * element,