mirror of https://github.com/mpv-player/mpv
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 >)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17627 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
52c917e583
commit
efdabb1b55
|
@ -687,10 +687,8 @@ static int control(priv_t *priv, int cmd, void *arg)
|
||||||
return TVI_CONTROL_TRUE;
|
return TVI_CONTROL_TRUE;
|
||||||
case TVI_CONTROL_TUN_SET_FREQ:
|
case TVI_CONTROL_TUN_SET_FREQ:
|
||||||
#if 0
|
#if 0
|
||||||
if (priv->input.audioset) {
|
|
||||||
set_mute(priv, 1);
|
set_mute(priv, 1);
|
||||||
usleep(100000); // wait to supress noise during switching
|
usleep(100000); // wait to supress noise during switching
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
frequency.tuner = 0;
|
frequency.tuner = 0;
|
||||||
frequency.type = V4L2_TUNER_ANALOG_TV;
|
frequency.type = V4L2_TUNER_ANALOG_TV;
|
||||||
|
@ -701,10 +699,8 @@ static int control(priv_t *priv, int cmd, void *arg)
|
||||||
return TVI_CONTROL_FALSE;
|
return TVI_CONTROL_FALSE;
|
||||||
}
|
}
|
||||||
#if 0
|
#if 0
|
||||||
if (priv->input.audioset) {
|
|
||||||
usleep(100000); // wait to supress noise during switching
|
usleep(100000); // wait to supress noise during switching
|
||||||
set_mute(priv, 0);
|
set_mute(priv, 0);
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
return TVI_CONTROL_TRUE;
|
return TVI_CONTROL_TRUE;
|
||||||
case TVI_CONTROL_TUN_GET_TUNER:
|
case TVI_CONTROL_TUN_GET_TUNER:
|
||||||
|
@ -901,9 +897,7 @@ static int uninit(priv_t *priv)
|
||||||
pthread_mutex_destroy(&priv->audio_mutex);
|
pthread_mutex_destroy(&priv->audio_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->input.audioset) {
|
|
||||||
set_mute(priv, 1);
|
set_mute(priv, 1);
|
||||||
}
|
|
||||||
|
|
||||||
/* free memory and close device */
|
/* free memory and close device */
|
||||||
free(priv->map); priv->map = NULL;
|
free(priv->map); priv->map = NULL;
|
||||||
|
@ -1312,9 +1306,7 @@ static int start(priv_t *priv)
|
||||||
priv->audio_skew = 0;
|
priv->audio_skew = 0;
|
||||||
priv->first = 1;
|
priv->first = 1;
|
||||||
|
|
||||||
if (priv->input.audioset) {
|
|
||||||
set_mute(priv, 0);
|
set_mute(priv, 0);
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue