diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 03:43:07 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-01 03:43:07 +0000 |
| commit | 70b9eea2ba01c3691497f49e4c45cb070c16193c (patch) | |
| tree | 9a6df61aa247a27275aad9c5245e419e89c2c640 /kradio3/plugins/v4lradio/linux | |
| parent | 998c1384ace4ae4655997c181fa33242148cd0a4 (diff) | |
| download | tderadio-70b9eea2ba01c3691497f49e4c45cb070c16193c.tar.gz tderadio-70b9eea2ba01c3691497f49e4c45cb070c16193c.zip | |
TQt4 port kradio
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kradio@1238952 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kradio3/plugins/v4lradio/linux')
| -rw-r--r-- | kradio3/plugins/v4lradio/linux/videodev.h | 4 | ||||
| -rw-r--r-- | kradio3/plugins/v4lradio/linux/videodev2.h | 24 |
2 files changed, 14 insertions, 14 deletions
diff --git a/kradio3/plugins/v4lradio/linux/videodev.h b/kradio3/plugins/v4lradio/linux/videodev.h index e16a8a8..0d7a5c0 100644 --- a/kradio3/plugins/v4lradio/linux/videodev.h +++ b/kradio3/plugins/v4lradio/linux/videodev.h @@ -389,9 +389,9 @@ struct video_code #define VID_HARDWARE_BT848 1 -#define VID_HARDWARE_QCAM_BW 2 +#define VID_HARDWARE_TQCAM_BW 2 #define VID_HARDWARE_PMS 3 -#define VID_HARDWARE_QCAM_C 4 +#define VID_HARDWARE_TQCAM_C 4 #define VID_HARDWARE_PSEUDO 5 #define VID_HARDWARE_SAA5249 6 #define VID_HARDWARE_AZTECH 7 diff --git a/kradio3/plugins/v4lradio/linux/videodev2.h b/kradio3/plugins/v4lradio/linux/videodev2.h index c41831a..5977820 100644 --- a/kradio3/plugins/v4lradio/linux/videodev2.h +++ b/kradio3/plugins/v4lradio/linux/videodev2.h @@ -391,7 +391,7 @@ struct v4l2_buffer /* Flags for 'flags' field */ #define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ +#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */ #define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ #define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ @@ -450,7 +450,7 @@ struct v4l2_captureparm __u32 reserved[4]; }; /* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ +#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ struct v4l2_outputparm @@ -623,7 +623,7 @@ struct v4l2_control __s32 value; }; -/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ +/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { __u32 id; @@ -637,7 +637,7 @@ struct v4l2_queryctrl __u32 reserved[2]; }; -/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ +/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */ struct v4l2_querymenu { __u32 id; @@ -828,7 +828,7 @@ struct v4l2_streamparm * I O C T L C O D E S F O R V I D E O D E V I C E S * */ -#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) +#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability) #define VIDIOC_RESERVED _IO ('V', 1) #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) @@ -837,13 +837,13 @@ struct v4l2_streamparm #define VIDIOC_G_COMP _IOR ('V', 6, struct v4l2_compression) #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #endif -#define VIDIOC_REQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) +#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) +#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) -#define VIDIOC_QBUF _IOWR ('V', 15, struct v4l2_buffer) -#define VIDIOC_DQBUF _IOWR ('V', 17, struct v4l2_buffer) +#define VIDIOC_TQBUF _IOWR ('V', 15, struct v4l2_buffer) +#define VIDIOC_DTQBUF _IOWR ('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW ('V', 18, int) #define VIDIOC_STREAMOFF _IOW ('V', 19, int) #define VIDIOC_G_PARM _IOWR ('V', 21, struct v4l2_streamparm) @@ -858,8 +858,8 @@ struct v4l2_streamparm #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) #define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) +#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) +#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) #define VIDIOC_G_INPUT _IOR ('V', 38, int) #define VIDIOC_S_INPUT _IOWR ('V', 39, int) #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) @@ -876,7 +876,7 @@ struct v4l2_streamparm #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) +#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) #define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) #define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) |