summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-11-13 14:37:48 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-11-13 14:37:48 +0000
commit0f6cb05b7f5ef8cf5406a9ac77d28648c66a6017 (patch)
tree0408aa625cc9b5368695323341bdccd75926cccf
parentf7029fb40a0397a6b117495931dfe0593b32e26e (diff)
downloadxine-lib-0f6cb05b7f5ef8cf5406a9ac77d28648c66a6017.tar.gz
xine-lib-0f6cb05b7f5ef8cf5406a9ac77d28648c66a6017.tar.bz2
Hopefully the fix for alsa09 passthru.
CVS patchset: 1028 CVS date: 2001/11/13 14:37:48
-rw-r--r--src/audio_out/audio_alsa_out.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 22d2a946c..744a5ea9e 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
* (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
*
*
- * $Id: audio_alsa_out.c,v 1.32 2001/10/20 02:01:51 guenter Exp $
+ * $Id: audio_alsa_out.c,v 1.33 2001/11/13 14:37:48 jcdutton Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -226,7 +226,10 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int
printf ("audio_alsa_out: >>> check if another program don't already use PCM <<<\n");
return 0;
}
-
+/*
+ * This is all not needed in the new ALSA API
+ * Beginning of old alsa section.
+ *
if ((mode & AO_CAP_MODE_A52) || (mode & AO_CAP_MODE_AC5)) {
snd_pcm_info_alloca(&info);
@@ -270,7 +273,9 @@ static int ao_alsa_open(ao_driver_t *this_gen, uint32_t bits, uint32_t rate, int
}
snd_ctl_close(ctl_handle);
}
-
+ *
+ * End of old alsa section.
+ */
/* We wanted non blocking open but now put it back to normal */
snd_pcm_nonblock(this->audio_fd, 0);
/*