diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-14 20:13:55 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-14 20:13:55 +0000 |
| commit | efdabb1b55b23bf669c17464bdfdbf22d8245ed4 (patch) | |
| tree | e7dedc58ed782039e9b49fed9e47c8ba2da28d23 /libmpdemux | |
| parent | 52c917e5835bb8cf37e41f4df85ee5db746495e0 (diff) | |
| download | mpv-efdabb1b55b23bf669c17464bdfdbf22d8245ed4.tar.bz2 mpv-efdabb1b55b23bf669c17464bdfdbf22d8245ed4.tar.xz | |
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
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tvi_v4l2.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/libmpdemux/tvi_v4l2.c b/libmpdemux/tvi_v4l2.c index e58799b0a7..d9e7008d99 100644 --- a/libmpdemux/tvi_v4l2.c +++ b/libmpdemux/tvi_v4l2.c @@ -687,10 +687,8 @@ static int control(priv_t *priv, int cmd, void *arg) 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 @@ static int control(priv_t *priv, int cmd, void *arg) 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 @@ static int uninit(priv_t *priv) 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 @@ static int start(priv_t *priv) priv->audio_skew = 0; priv->first = 1; - if (priv->input.audioset) { - set_mute(priv, 0); - } + set_mute(priv, 0); return 1; } |