[Mplayer-cvslog] CVS: main/libmpdemux tvi_v4l.c, 1.70, 1.71 tv.c, 1.65, 1.66

[Attila Kinali CVS]

CVS change done by Attila Kinali CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv787

Modified Files:
	tvi_v4l.c tv.c 
Log Message:
dont mess up v4l volumes
patch by Oswald Buddenhagen <ossi at kde.org>


Index: tvi_v4l.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- tvi_v4l.c	20 Jan 2004 13:32:05 -0000	1.70
+++ tvi_v4l.c	22 Feb 2004 15:21:44 -0000	1.71
@@ -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]);
 	    }

Index: tv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tv.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- tv.c	11 Jan 2004 17:07:32 -0000	1.65
+++ tv.c	22 Feb 2004 15:21:44 -0000	1.66
@@ -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;