Mercurial > mplayer.hg

diff libmpdemux/audio_in.c @ 11775:66e491c35dc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ALSA 1.x audio out driver
author henry
date Sun, 11 Jan 2004 17:07:32 +0000
parents 31f12f99118b
children dfbe8cd0e081
line wrap: on
line diff
--- a/libmpdemux/audio_in.c	Sun Jan 11 13:36:53 2004 +0000
+++ b/libmpdemux/audio_in.c	Sun Jan 11 17:07:32 2004 +0000
@@ -24,7 +24,7 @@
     ai->samplesize = -1;
 
     switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     case AUDIO_IN_ALSA:
 	ai->alsa.handle = NULL;
 	ai->alsa.log = NULL;
@@ -46,7 +46,7 @@
 {
     
     switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     case AUDIO_IN_ALSA:
 	if (ai_alsa_init(ai) < 0) return -1;
 	ai->setup = 1;
@@ -66,7 +66,7 @@
 int audio_in_set_samplerate(audio_in_t *ai, int rate)
 {
     switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     case AUDIO_IN_ALSA:
 	ai->req_samplerate = rate;
 	if (!ai->setup) return 0;
@@ -88,7 +88,7 @@
 int audio_in_set_channels(audio_in_t *ai, int channels)
 {
     switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     case AUDIO_IN_ALSA:
 	ai->req_channels = channels;
 	if (!ai->setup) return 0;
@@ -109,12 +109,12 @@
 
 int audio_in_set_device(audio_in_t *ai, char *device)
 {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     int i;
 #endif
     if (ai->setup) return -1;
     switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     case AUDIO_IN_ALSA:
 	if (ai->alsa.device) free(ai->alsa.device);
 	ai->alsa.device = strdup(device);
@@ -139,7 +139,7 @@
 {
     if (ai->setup) {
 	switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
 	case AUDIO_IN_ALSA:
 	    if (ai->alsa.log)
 		snd_output_close(ai->alsa.log);
@@ -163,7 +163,7 @@
 int audio_in_start_capture(audio_in_t *ai)
 {
     switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     case AUDIO_IN_ALSA:
 	return snd_pcm_start(ai->alsa.handle);
 #endif
@@ -181,7 +181,7 @@
     int ret;
     
     switch (ai->type) {
-#ifdef HAVE_ALSA9	  
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
     case AUDIO_IN_ALSA:
 	ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size);
 	if (ret != ai->alsa.chunk_size) {