diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-25 16:53:02 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-08-25 16:53:02 -0300 |
commit | 5bb33fe25ae2e49d52b945f25504c51ee116c3ee (patch) | |
tree | aa2319b07856a48ad46c16d4480f37c5ea1b3999 /linux/drivers/media/video/bt8xx/bttv-driver.c | |
parent | 9a4c4bb7abbb9174990491388b3b5b963a8e824e (diff) | |
download | mediapointer-dvb-s2-5bb33fe25ae2e49d52b945f25504c51ee116c3ee.tar.gz mediapointer-dvb-s2-5bb33fe25ae2e49d52b945f25504c51ee116c3ee.tar.bz2 |
Forward VIDIOCGAUDIO and VIDIOCSAUDIO through v4l1-compat
From: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
linux/drivers/media/video/bt8xx/bttv-driver.c | 41 --------------------------
1 file changed, 41 deletions(-)
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index bddcbf620..0c3a98955 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -1932,47 +1932,6 @@ static struct videobuf_queue_ops bttv_video_qops = { static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg) { switch (cmd) { -#ifdef CONFIG_VIDEO_V4L1 - case VIDIOCGAUDIO: - { - struct video_audio *v = arg; - - memset(v,0,sizeof(*v)); - strcpy(v->name,"Television"); - v->flags |= VIDEO_AUDIO_MUTABLE; - v->mode = VIDEO_SOUND_MONO; - - mutex_lock(&btv->lock); - bttv_call_i2c_clients(btv,cmd,v); - - /* card specific hooks */ - if (btv->audio_hook) - btv->audio_hook(btv,v,0); - - mutex_unlock(&btv->lock); - return 0; - } - case VIDIOCSAUDIO: - { - struct video_audio *v = arg; - unsigned int audio = v->audio; - - if (audio >= bttv_tvcards[btv->c.type].audio_inputs) - return -EINVAL; - - mutex_lock(&btv->lock); - audio_mute(btv, (v->flags&VIDEO_AUDIO_MUTE) ? 1 : 0); - bttv_call_i2c_clients(btv,cmd,v); - - /* card specific hooks */ - if (btv->audio_hook) - btv->audio_hook(btv,v,1); - - mutex_unlock(&btv->lock); - return 0; - } -#endif - /* *** v4l2 *** ************************************************ */ case VIDIOC_ENUMSTD: { struct v4l2_standard *e = arg; |