summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-06 00:24:05 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-09-06 00:24:05 +0000
commit5ddc6023e2240d382be6562da0b6ae9732d209cf (patch)
tree5341ed87b3f9ed536aefd83aaf38c84d2bf0d261 /libmpdemux
parent16816457b80ccca4bc38b8fbbca3e01d8dfc610e (diff)
downloadmpv-5ddc6023e2240d382be6562da0b6ae9732d209cf.tar.bz2
mpv-5ddc6023e2240d382be6562da0b6ae9732d209cf.tar.xz
audio id setting support for bsdbt848 by Nikolay Nikolaev <nicknickolaev@yahoo.com>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10823 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/tv.c2
-rw-r--r--libmpdemux/tv.h2
-rw-r--r--libmpdemux/tvi_bsdbt848.c8
3 files changed, 10 insertions, 2 deletions
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c
index a4f0aeed62..16467cd97f 100644
--- a/libmpdemux/tv.c
+++ b/libmpdemux/tv.c
@@ -57,9 +57,9 @@ int tv_param_input = 0; /* used in v4l and bttv */
int tv_param_outfmt = IMGFMT_YV12;
float tv_param_fps = -1.0;
char **tv_param_channels = NULL;
+int tv_param_audio_id = 0;
#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
int tv_param_amode = -1;
-int tv_param_audio_id = 0;
int tv_param_volume = 60000;
int tv_param_bass = -1;
int tv_param_treble = -1;
diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h
index ce3ac1e3c0..69ec328282 100644
--- a/libmpdemux/tv.h
+++ b/libmpdemux/tv.h
@@ -27,9 +27,9 @@ extern char **tv_param_channels;
extern int tv_param_noaudio;
extern int tv_param_immediate;
extern int tv_param_audiorate;
+extern int tv_param_audio_id;
#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
extern int tv_param_amode;
-extern int tv_param_audio_id;
extern int tv_param_volume;
extern int tv_param_bass;
extern int tv_param_treble;
diff --git a/libmpdemux/tvi_bsdbt848.c b/libmpdemux/tvi_bsdbt848.c
index 6b1d01750a..32f66650e3 100644
--- a/libmpdemux/tvi_bsdbt848.c
+++ b/libmpdemux/tvi_bsdbt848.c
@@ -358,6 +358,14 @@ static int control(priv_t *priv, int cmd, void *arg)
return(0);
}
+#ifdef BT848_SAUDIO
+ if((priv->tunerready == TRUE) &&
+ ioctl(priv->btfd, BT848_SAUDIO, &tv_param_audio_id) < 0)
+ {
+ perror("audioid:ioctl");
+ }
+#endif
+
return(TVI_CONTROL_TRUE);
}