Mercurial > mplayer.hg

changeset 11986:80f8c8cffa31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dont mess up v4l volumes patch by Oswald Buddenhagen <ossi@kde.org>
author attila
date Sun, 22 Feb 2004 15:21:44 +0000
parents c43d654a1f45
children 5f780dae2cf3
files libmpdemux/tv.c libmpdemux/tvi_v4l.c
diffstat 2 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/tv.c	Sun Feb 22 06:20:48 2004 +0000
+++ b/libmpdemux/tv.c	Sun Feb 22 15:21:44 2004 +0000
@@ -60,7 +60,7 @@
 int tv_param_audio_id = 0;
 #if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
 int tv_param_amode = -1;
-int tv_param_volume = 60000;
+int tv_param_volume = -1;
 int tv_param_bass = -1;
 int tv_param_treble = -1;
 int tv_param_balance = -1;
--- a/libmpdemux/tvi_v4l.c	Sun Feb 22 06:20:48 2004 +0000
+++ b/libmpdemux/tvi_v4l.c	Sun Feb 22 15:21:44 2004 +0000
@@ -332,7 +332,6 @@
 	}
 
 	/* mute all channels */
-	priv->audio[i].volume = 0;
 	priv->audio[i].flags |= VIDEO_AUDIO_MUTE;
 	reqmode = -1;
 	if (tv_param_amode >= 0) {
@@ -696,7 +695,6 @@
     mp_msg(MSGT_TV, MSGL_V, "done\n");
 
     if (priv->capability.audios) {
-	priv->audio[priv->audio_id].volume = 0;
 	priv->audio[priv->audio_id].flags |= VIDEO_AUDIO_MUTE;
 	ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]);
     }
@@ -1128,7 +1126,6 @@
 	    unsigned long freq = (unsigned long)*(void **)arg;
 	    
 	    if (priv->capability.audios) {
-		priv->audio[priv->audio_id].volume = 0;
 		priv->audio[priv->audio_id].flags |= VIDEO_AUDIO_MUTE;
 		ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]);
 	    }
@@ -1147,7 +1144,6 @@
 	    usleep(100000); // wait to supress noise during switching
 
 	    if (priv->capability.audios) {
-		priv->audio[priv->audio_id].volume = tv_param_volume;
 		priv->audio[priv->audio_id].flags &= ~VIDEO_AUDIO_MUTE;
 		ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]);
 	    }