Mercurial > mplayer.hg

comparison libao2/ao_alsa5.c @ 14245:815f03b7cee5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing AFMT_ dependancy
author alex
date Mon, 27 Dec 2004 17:30:15 +0000
parents a92101a7eb49
children 8f59f661f317
comparison
equal deleted inserted replaced
14244:9b03ad0254ae 14245:815f03b7cee5
11 11
12 #include "config.h" 12 #include "config.h"
13 13
14 #include "audio_out.h" 14 #include "audio_out.h"
15 #include "audio_out_internal.h" 15 #include "audio_out_internal.h"
16 #include "afmt.h" 16 #include "libaf/af_format.h"
17 17
18 #include "mp_msg.h" 18 #include "mp_msg.h"
19 #include "help_mp.h" 19 #include "help_mp.h"
20 20
21 static ao_info_t info = 21 static ao_info_t info =
73 ao_data.buffersize = 16384; 73 ao_data.buffersize = 16384;
74 74
75 memset(&alsa_format, 0, sizeof(alsa_format)); 75 memset(&alsa_format, 0, sizeof(alsa_format));
76 switch (format) 76 switch (format)
77 { 77 {
78 case AFMT_S8: 78 case AF_FORMAT_S8:
79 alsa_format.format = SND_PCM_SFMT_S8; 79 alsa_format.format = SND_PCM_SFMT_S8;
80 break; 80 break;
81 case AFMT_U8: 81 case AF_FORMAT_U8:
82 alsa_format.format = SND_PCM_SFMT_U8; 82 alsa_format.format = SND_PCM_SFMT_U8;
83 break; 83 break;
84 case AFMT_U16_LE: 84 case AF_FORMAT_U16_LE:
85 alsa_format.format = SND_PCM_SFMT_U16_LE; 85 alsa_format.format = SND_PCM_SFMT_U16_LE;
86 break; 86 break;
87 case AFMT_U16_BE: 87 case AF_FORMAT_U16_BE:
88 alsa_format.format = SND_PCM_SFMT_U16_BE; 88 alsa_format.format = SND_PCM_SFMT_U16_BE;
89 break; 89 break;
90 #ifndef WORDS_BIGENDIAN 90 #ifndef WORDS_BIGENDIAN
91 case AFMT_AC3: 91 case AF_FORMAT_AC3:
92 #endif 92 #endif
93 case AFMT_S16_LE: 93 case AF_FORMAT_S16_LE:
94 alsa_format.format = SND_PCM_SFMT_S16_LE; 94 alsa_format.format = SND_PCM_SFMT_S16_LE;
95 break; 95 break;
96 #ifdef WORDS_BIGENDIAN 96 #ifdef WORDS_BIGENDIAN
97 case AFMT_AC3: 97 case AF_FORMAT_AC3:
98 #endif 98 #endif
99 case AFMT_S16_BE: 99 case AF_FORMAT_S16_BE:
100 alsa_format.format = SND_PCM_SFMT_S16_BE; 100 alsa_format.format = SND_PCM_SFMT_S16_BE;
101 break; 101 break;
102 default: 102 default:
103 alsa_format.format = SND_PCM_SFMT_MPEG; 103 alsa_format.format = SND_PCM_SFMT_MPEG;
104 break; 104 break;