[Mplayer-cvslog] CVS: main/libao2 audio_out.c, 1.41, 1.42 ao_alsa9.c, 1.46, NONE ao_alsa1x.c, 1.44, NONE

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv20886/libao2

Modified Files:
	audio_out.c 
Removed Files:
	ao_alsa9.c ao_alsa1x.c 
Log Message:
removing ao_alsa9.c and ao_alsa1x.c as they are superseded by ao_alsa.c


Index: audio_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- audio_out.c	1 Oct 2004 19:51:02 -0000	1.41
+++ audio_out.c	4 Oct 2004 15:10:32 -0000	1.42
@@ -138,6 +138,11 @@
     if(ao_list && ao_list[0])
       while(ao_list[0][0]){
         char* ao=strdup(ao_list[0]);
+        if (strncmp(ao, "alsa9", 5) == 0 || strncmp(ao, "alsa1x", 6) == 0) {
+          mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_ALSA9_1x_Removed);
+          free(ao);
+          exit_player(NULL);
+        }
 	ao_subdevice=strchr(ao,':');
 	if(ao_subdevice){
 	    ao_subdevice[0]=0;

--- ao_alsa9.c DELETED ---

--- ao_alsa1x.c DELETED ---