summaryrefslogtreecommitdiffstats
path: root/kradio3/plugins/v4lradio
diff options
context:
space:
mode:
Diffstat (limited to 'kradio3/plugins/v4lradio')
-rw-r--r--kradio3/plugins/v4lradio/linux/videodev2.h18
-rw-r--r--kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp20
-rw-r--r--kradio3/plugins/v4lradio/v4lcfg_interfaces.h22
-rw-r--r--kradio3/plugins/v4lradio/v4lradio.cpp12
4 files changed, 36 insertions, 36 deletions
diff --git a/kradio3/plugins/v4lradio/linux/videodev2.h b/kradio3/plugins/v4lradio/linux/videodev2.h
index 5977820..a26f74a 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_TQUEUED 0x0002 /* Buffer is queued for processing */
+#define V4L2_BUF_FLAG_QUEUED 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_HIGHTQUALITY 0x0001 /* High quality imaging mode */
+#define V4L2_MODE_HIGHQUALITY 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_TQUERYCTRL ioctl for querying controls */
+/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
struct v4l2_queryctrl
{
__u32 id;
@@ -637,7 +637,7 @@ struct v4l2_queryctrl
__u32 reserved[2];
};
-/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */
+/* Used in the VIDIOC_QUERYMENU 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_TQUERYCAP _IOR ('V', 0, struct v4l2_capability)
+#define VIDIOC_QUERYCAP _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)
@@ -838,7 +838,7 @@ struct v4l2_streamparm
#define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression)
#endif
#define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers)
-#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer)
+#define VIDIOC_QUERYBUF _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)
@@ -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_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl)
-#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu)
+#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl)
+#define VIDIOC_QUERYMENU _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_TQUERYSTD _IOR ('V', 63, v4l2_std_id)
+#define VIDIOC_QUERYSTD _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)
diff --git a/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp b/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp
index ea0d110..9ef14aa 100644
--- a/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp
+++ b/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp
@@ -119,48 +119,48 @@ IF_IMPL_SENDER ( IV4LCfgClient::sendVolumeZeroOnPowerOff(bool a),
static TQString defaultRDev("/dev/radio");
// static TQString defaultMDev("/dev/mixer");
-IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryRadioDevice (),
+IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryRadioDevice (),
getRadioDevice(),
defaultRDev
)
-IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerID (),
+IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerID (),
getPlaybackMixerID(),
TQString()
)
-IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryCaptureMixerID (),
+IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryCaptureMixerID (),
getCaptureMixerID(),
TQString()
)
static const TQString channel_line("Line");
-IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerChannel(),
+IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerChannel(),
getPlaybackMixerChannel(),
channel_line
)
-IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryCaptureMixerChannel(),
+IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryCaptureMixerChannel(),
getCaptureMixerChannel(),
channel_line
)
-IF_IMPL_TQUERY ( float IV4LCfgClient::queryDeviceVolume (),
+IF_IMPL_QUERY ( float IV4LCfgClient::queryDeviceVolume (),
getDeviceVolume(),
0.0
)
-IF_IMPL_TQUERY ( V4LCaps IV4LCfgClient::queryCapabilities(TQString dev),
+IF_IMPL_QUERY ( V4LCaps IV4LCfgClient::queryCapabilities(TQString dev),
getCapabilities(dev),
V4LCaps()
)
-IF_IMPL_TQUERY ( bool IV4LCfgClient::queryActivePlayback(),
+IF_IMPL_QUERY ( bool IV4LCfgClient::queryActivePlayback(),
getActivePlayback(),
false
)
-IF_IMPL_TQUERY ( bool IV4LCfgClient::queryMuteOnPowerOff(),
+IF_IMPL_QUERY ( bool IV4LCfgClient::queryMuteOnPowerOff(),
getMuteOnPowerOff(),
false
)
-IF_IMPL_TQUERY ( bool IV4LCfgClient::queryVolumeZeroOnPowerOff(),
+IF_IMPL_QUERY ( bool IV4LCfgClient::queryVolumeZeroOnPowerOff(),
getVolumeZeroOnPowerOff(),
false
)
diff --git a/kradio3/plugins/v4lradio/v4lcfg_interfaces.h b/kradio3/plugins/v4lradio/v4lcfg_interfaces.h
index 2a099e1..d9c2a24 100644
--- a/kradio3/plugins/v4lradio/v4lcfg_interfaces.h
+++ b/kradio3/plugins/v4lradio/v4lcfg_interfaces.h
@@ -131,17 +131,17 @@ RECEIVERS:
IF_RECEIVER( noticeMuteOnPowerOffChanged(bool a) )
IF_RECEIVER( noticeVolumeZeroOnPowerOffChanged(bool a) )
-TQUERIES:
- IF_TQUERY ( const TQString &queryRadioDevice () )
- IF_TQUERY ( const TQString &queryPlaybackMixerID () )
- IF_TQUERY ( const TQString &queryCaptureMixerID () )
- IF_TQUERY ( const TQString &queryPlaybackMixerChannel() )
- IF_TQUERY ( const TQString &queryCaptureMixerChannel() )
- IF_TQUERY ( float queryDeviceVolume() )
- IF_TQUERY ( V4LCaps queryCapabilities(TQString dev = TQString()) )
- IF_TQUERY ( bool queryActivePlayback() )
- IF_TQUERY ( bool queryMuteOnPowerOff() )
- IF_TQUERY ( bool queryVolumeZeroOnPowerOff() )
+QUERIES:
+ IF_QUERY ( const TQString &queryRadioDevice () )
+ IF_QUERY ( const TQString &queryPlaybackMixerID () )
+ IF_QUERY ( const TQString &queryCaptureMixerID () )
+ IF_QUERY ( const TQString &queryPlaybackMixerChannel() )
+ IF_QUERY ( const TQString &queryCaptureMixerChannel() )
+ IF_QUERY ( float queryDeviceVolume() )
+ IF_QUERY ( V4LCaps queryCapabilities(TQString dev = TQString()) )
+ IF_QUERY ( bool queryActivePlayback() )
+ IF_QUERY ( bool queryMuteOnPowerOff() )
+ IF_QUERY ( bool queryVolumeZeroOnPowerOff() )
RECEIVERS:
virtual void noticeConnectedI (cmplInterface *, bool /*pointer_valid*/);
diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp
index e149ccf..a02dcfe 100644
--- a/kradio3/plugins/v4lradio/v4lradio.cpp
+++ b/kradio3/plugins/v4lradio/v4lradio.cpp
@@ -1226,7 +1226,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
#ifdef HAVE_V4L2
v4l2_capability caps2;
- r = ioctl(fd, VIDIOC_TQUERYCAP, &caps2);
+ r = ioctl(fd, VIDIOC_QUERYCAP, &caps2);
if (r == 0) {
c.version = 2;
@@ -1247,13 +1247,13 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
c.unsetBalance();
ctrl.id = V4L2_CID_AUDIO_MUTE;
- if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl))
+ if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl))
c.hasMute = !(ctrl.flags & V4L2_CTRL_FLAG_DISABLED);
else
logError(i18n("V4L2: Querying mute control failed"));
ctrl.id = V4L2_CID_AUDIO_VOLUME;
- if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) {
+ if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) {
if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED))
c.setVolume(ctrl.minimum, ctrl.maximum);
} else {
@@ -1261,7 +1261,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
}
ctrl.id = V4L2_CID_AUDIO_TREBLE;
- if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) {
+ if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) {
if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED))
c.setTreble(ctrl.minimum, ctrl.maximum);
} else {
@@ -1269,7 +1269,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
}
ctrl.id = V4L2_CID_AUDIO_BASS;
- if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) {
+ if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) {
if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED))
c.setBass(ctrl.minimum, c.maxBass = ctrl.maximum);
} else {
@@ -1277,7 +1277,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const
}
ctrl.id = V4L2_CID_AUDIO_BALANCE;
- if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) {
+ if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) {
if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED))
c.setBalance(ctrl.minimum, ctrl.maximum);
} else {
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-17 07:50:03 +0000