[MPlayer-cvslog] CVS: main/libmpdemux tvi_v4l2.c,1.35,1.36

[Aurelien Jacobs CVS]

CVS change done by Aurelien Jacobs CVS

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

Modified Files:
	tvi_v4l2.c 
Log Message:
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 >)

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- tvi_v4l2.c	16 Dec 2005 23:04:20 -0000	1.35
+++ tvi_v4l2.c	14 Feb 2006 20:13:55 -0000	1.36
@@ -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;
 }