Mercurial > mplayer.hg
changeset 17626:5627625b0cdb
Don't test the v4l2_input audioset field for audio capabilities but still try changing the mute setting (patch by Jesse Allen < the3dfxdude _at_ gmail.com >)
| author | aurel |
|---|---|
| date | Tue, 14 Feb 2006 20:13:55 +0000 |
| parents | c5f33a8021c7 |
| children | 24238abbd150 |
| files | libmpdemux/tvi_v4l2.c |
| diffstat | 1 files changed, 6 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/tvi_v4l2.c Tue Feb 14 09:55:14 2006 +0000 +++ b/libmpdemux/tvi_v4l2.c Tue Feb 14 20:13:55 2006 +0000 @@ -687,10 +687,8 @@ return TVI_CONTROL_TRUE; case TVI_CONTROL_TUN_SET_FREQ: #if 0 - if (priv->input.audioset) { - set_mute(priv, 1); - usleep(100000); // wait to supress noise during switching - } + set_mute(priv, 1); + usleep(100000); // wait to supress noise during switching #endif frequency.tuner = 0; frequency.type = V4L2_TUNER_ANALOG_TV; @@ -701,10 +699,8 @@ return TVI_CONTROL_FALSE; } #if 0 - if (priv->input.audioset) { - usleep(100000); // wait to supress noise during switching - set_mute(priv, 0); - } + usleep(100000); // wait to supress noise during switching + set_mute(priv, 0); #endif return TVI_CONTROL_TRUE; case TVI_CONTROL_TUN_GET_TUNER: @@ -901,9 +897,7 @@ pthread_mutex_destroy(&priv->audio_mutex); } - if (priv->input.audioset) { - set_mute(priv, 1); - } + set_mute(priv, 1); /* free memory and close device */ free(priv->map); priv->map = NULL; @@ -1312,9 +1306,7 @@ priv->audio_skew = 0; priv->first = 1; - if (priv->input.audioset) { - set_mute(priv, 0); - } + set_mute(priv, 0); return 1; }