summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-08-25 16:53:07 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-08-25 16:53:07 -0300
commita569bbcfb1eaa8fee24a6e70f43358088a84a77a (patch)
treee706a01e84a4c8aa66048583e763854ecbd8466b
parentba37c220adc7b3dac0ec2ff292d53afd9316a9ce (diff)
downloadmediapointer-dvb-s2-a569bbcfb1eaa8fee24a6e70f43358088a84a77a.tar.gz
mediapointer-dvb-s2-a569bbcfb1eaa8fee24a6e70f43358088a84a77a.tar.bz2
Report detected sound carrier into rxsubchans
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-audio-hook.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
-rw-r--r--linux/drivers/media/video/bt8xx/bttv-audio-hook.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c
index a075198f8..67b634235 100644
--- a/linux/drivers/media/video/bt8xx/bttv-audio-hook.c
+++ b/linux/drivers/media/video/bt8xx/bttv-audio-hook.c
@@ -101,24 +101,28 @@ void gvbctv5pci_audio(struct bttv *btv, struct v4l2_tuner *t, int set)
} else {
switch (val & 0x70) {
case 0x10:
- t->audmode = V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
+ t->rxsubchans = V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
break;
case 0x30:
- t->audmode = V4L2_TUNER_MODE_LANG2;
+ t->rxsubchans = V4L2_TUNER_SUB_LANG2;
break;
case 0x50:
- t->audmode = V4L2_TUNER_MODE_LANG1;
+ t->rxsubchans = V4L2_TUNER_SUB_LANG1;
break;
case 0x60:
- t->audmode = V4L2_TUNER_MODE_STEREO;
+ t->rxsubchans = V4L2_TUNER_SUB_STEREO;
break;
case 0x70:
- t->audmode = V4L2_TUNER_MODE_MONO;
+ t->rxsubchans = V4L2_TUNER_SUB_MONO;
break;
default:
- t->audmode = V4L2_TUNER_MODE_MONO | V4L2_TUNER_MODE_STEREO |
- V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
+ t->rxsubchans = V4L2_TUNER_SUB_MONO |
+ V4L2_TUNER_SUB_STEREO |
+ V4L2_TUNER_SUB_LANG1 |
+ V4L2_TUNER_SUB_LANG2;
}
+ t->audmode = V4L2_TUNER_MODE_STEREO |
+ V4L2_TUNER_MODE_LANG1 | V4L2_TUNER_MODE_LANG2;
}
}