diff options
| -rw-r--r-- | cfg-common.h | 2 | ||||
| -rw-r--r-- | libmpdemux/tv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/tv.h | 2 | ||||
| -rw-r--r-- | libmpdemux/tvi_bsdbt848.c | 8 |
4 files changed, 11 insertions, 3 deletions
diff --git a/cfg-common.h b/cfg-common.h index 6d2e404c8d..aef7949a82 100644 --- a/cfg-common.h +++ b/cfg-common.h @@ -335,8 +335,8 @@ m_option_t tvopts_conf[]={ {"alsa", &tv_param_alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #endif {"adevice", &tv_param_adevice, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"audioid", &tv_param_audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, #endif + {"audioid", &tv_param_audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; #endif 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); } |