diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-02-06 12:40:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-03-05 14:12:05 -0300 |
| commit | 01df530c2791610727e345b3dd97ef75943c7320 (patch) | |
| tree | c0e6588230df2335afe4ff6a9bd4fc59e635ede2 /drivers/media/pci/bt8xx/bttvp.h | |
| parent | 5d478e0de87113b9fa6b4021935e605b71e0ee28 (diff) | |
[media] bttv: convert to the control framework
Note that the private chroma agc control has been replaced with the standard
CHROMA_AGC control.
Also fixes a mute/automute problem where closing the file handle would force
mute on. That's not what you want since that would make the mute state out of
sync with the mute control. Instead check against the user count.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/bt8xx/bttvp.h')
| -rw-r--r-- | drivers/media/pci/bt8xx/bttvp.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h index 528e03ec19e..c3882ef3c52 100644 --- a/drivers/media/pci/bt8xx/bttvp.h +++ b/drivers/media/pci/bt8xx/bttvp.h @@ -33,9 +33,10 @@ #include <linux/input.h> #include <linux/mutex.h> #include <linux/scatterlist.h> +#include <linux/device.h> #include <asm/io.h> #include <media/v4l2-common.h> -#include <linux/device.h> +#include <media/v4l2-ctrls.h> #include <media/videobuf-dma-sg.h> #include <media/tveeprom.h> #include <media/rc-core.h> @@ -393,12 +394,17 @@ struct bttv { wait_queue_head_t i2c_queue; struct v4l2_subdev *sd_msp34xx; struct v4l2_subdev *sd_tvaudio; + struct v4l2_subdev *sd_tda7432; /* video4linux (1) */ struct video_device *video_dev; struct video_device *radio_dev; struct video_device *vbi_dev; + /* controls */ + struct v4l2_ctrl_handler ctrl_handler; + struct v4l2_ctrl_handler radio_ctrl_handler; + /* infrared remote */ int has_remote; struct bttv_ir *remote; @@ -426,17 +432,9 @@ struct bttv { /* various options */ int opt_combfilter; - int opt_lumafilter; int opt_automute; - int opt_chroma_agc; - int opt_color_killer; - int opt_adc_crush; int opt_vcr_hack; - int opt_whitecrush_upper; - int opt_whitecrush_lower; int opt_uv_ratio; - int opt_full_luma_range; - int opt_coring; /* radio data/state */ int has_radio; |