Mercurial > mplayer.hg

changeset 17848:4e32c2caf696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not try to count hardware sound cards because there might be none when using a software plugin for JACK/OSS/Polypaudio/Bluetooth/etc.
author cladisch
date Mon, 13 Mar 2006 10:49:12 +0000
parents f5131b5b0061
children ebebe97331af
files libao2/ao_alsa.c
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_alsa.c	Mon Mar 13 09:03:43 2006 +0000
+++ b/libao2/ao_alsa.c	Mon Mar 13 10:49:12 2006 +0000
@@ -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) {