[MPlayer-cvslog] CVS: main/libao2 ao_alsa.c,1.38,1.39

[Clemens Ladisch CVS]

CVS change done by Clemens Ladisch CVS

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

Modified Files:
	ao_alsa.c 
Log Message:
Do not try to count hardware sound cards because there might be none
when using a software plugin for JACK/OSS/Polypaudio/Bluetooth/etc.

Index: ao_alsa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_alsa.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ao_alsa.c	27 Feb 2006 10:09:05 -0000	1.38
+++ ao_alsa.c	13 Mar 2006 10:49:12 -0000	1.39
@@ -272,7 +272,6 @@
 static int init(int rate_hz, int channels, int format, int flags)
 {
     int err;
-    int cards = -1;
     int block;
     strarg_t device;
     snd_pcm_uframes_t bufsize;
@@ -298,12 +297,6 @@
 
     snd_lib_error_set_handler(alsa_error_handler);
     
-    if ((err = snd_card_next(&cards)) < 0 || cards < 0)
-    {
-      mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: no soundcards found: %s\n", snd_strerror(err));
-      return(0);
-    }
-
     ao_data.samplerate = rate_hz;
     ao_data.format = format;
     ao_data.channels = channels;
@@ -427,7 +420,7 @@
     ao_noblock = !block;
     parse_device(alsa_device, device.str, device.len);
 
-	mp_msg(MSGT_AO,MSGL_INFO,"alsa-init: %d soundcard%s found, using: %s\n", cards+1,(cards >= 0) ? "" : "s", alsa_device);
+    mp_msg(MSGT_AO,MSGL_INFO,"alsa-init: using device %s\n", alsa_device);
 
     //setting modes for block or nonblock-mode
     if (ao_noblock) {