Mercurial > mplayer.hg
changeset 10822:6377c7d0459e
audio id setting support for bsdbt848 by Nikolay Nikolaev <nicknickolaev@yahoo.com>
| author | alex |
|---|---|
| date | Sat, 06 Sep 2003 00:24:05 +0000 |
| parents | e9e5dca4af9e |
| children | df1433f614f6 |
| files | cfg-common.h libmpdemux/tv.c libmpdemux/tv.h libmpdemux/tvi_bsdbt848.c |
| diffstat | 4 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Sat Sep 06 00:14:08 2003 +0000 +++ b/cfg-common.h Sat Sep 06 00:24:05 2003 +0000 @@ -335,8 +335,8 @@ {"alsa", &tv_param_alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif {"adevice", &tv_param_adevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, +#endif {"audioid", &tv_param_audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, -#endif {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif
--- a/libmpdemux/tv.c Sat Sep 06 00:14:08 2003 +0000 +++ b/libmpdemux/tv.c Sat Sep 06 00:24:05 2003 +0000 @@ -57,9 +57,9 @@ 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;
--- a/libmpdemux/tv.h Sat Sep 06 00:14:08 2003 +0000 +++ b/libmpdemux/tv.h Sat Sep 06 00:24:05 2003 +0000 @@ -27,9 +27,9 @@ 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;
--- a/libmpdemux/tvi_bsdbt848.c Sat Sep 06 00:14:08 2003 +0000 +++ b/libmpdemux/tvi_bsdbt848.c Sat Sep 06 00:24:05 2003 +0000 @@ -358,6 +358,14 @@ 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); }