summaryrefslogtreecommitdiffstats
path: root/libao2/ao_alsa.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 17:30:15 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 17:30:15 +0000
commit507121f7fe2d170dd8db99d3112602036ddef718 (patch)
tree38b26e115cfadde356b005496286f78307839440 /libao2/ao_alsa.c
parent00f99a82a8f57573e3e6982cf9d014c9b9d8a68b (diff)
downloadmpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.bz2
mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.xz
removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_alsa.c')
-rw-r--r--libao2/ao_alsa.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 2aa6cdaebe..539fd0fa7c 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -37,7 +37,7 @@
#include "audio_out.h"
#include "audio_out_internal.h"
-#include "afmt.h"
+#include "libaf/af_format.h"
static ao_info_t info =
{
@@ -125,7 +125,7 @@ static int control(int cmd, void *arg)
}
if(mixer_device) card = mixer_device;
- if(ao_data.format == AFMT_AC3)
+ if(ao_data.format == AF_FORMAT_AC3)
return CONTROL_TRUE;
//allocate simple id
@@ -275,42 +275,42 @@ static int init(int rate_hz, int channels, int format, int flags)
switch (format)
{
- case AFMT_S8:
+ case AF_FORMAT_S8:
alsa_format = SND_PCM_FORMAT_S8;
break;
- case AFMT_U8:
+ case AF_FORMAT_U8:
alsa_format = SND_PCM_FORMAT_U8;
break;
- case AFMT_U16_LE:
+ case AF_FORMAT_U16_LE:
alsa_format = SND_PCM_FORMAT_U16_LE;
break;
- case AFMT_U16_BE:
+ case AF_FORMAT_U16_BE:
alsa_format = SND_PCM_FORMAT_U16_BE;
break;
#ifndef WORDS_BIGENDIAN
- case AFMT_AC3:
+ case AF_FORMAT_AC3:
#endif
- case AFMT_S16_LE:
+ case AF_FORMAT_S16_LE:
alsa_format = SND_PCM_FORMAT_S16_LE;
break;
#ifdef WORDS_BIGENDIAN
- case AFMT_AC3:
+ case AF_FORMAT_AC3:
#endif
- case AFMT_S16_BE:
+ case AF_FORMAT_S16_BE:
alsa_format = SND_PCM_FORMAT_S16_BE;
break;
- case AFMT_S32_LE:
+ case AF_FORMAT_S32_LE:
alsa_format = SND_PCM_FORMAT_S32_LE;
break;
- case AFMT_S32_BE:
+ case AF_FORMAT_S32_BE:
alsa_format = SND_PCM_FORMAT_S32_BE;
break;
- case AFMT_FLOAT:
+ case AF_FORMAT_FLOAT_LE:
alsa_format = SND_PCM_FORMAT_FLOAT_LE;
break;
default:
- alsa_format = SND_PCM_FORMAT_MPEG; //? default should be -1
+ alsa_format = SND_PCM_FORMAT_MPEG2; //? default should be -1
break;
}
@@ -412,7 +412,7 @@ static int init(int rate_hz, int channels, int format, int flags)
* while opening the abstract alias for the spdif subdevice
* 'iec958'
*/
- if (format == AFMT_AC3) {
+ if (format == AF_FORMAT_AC3) {
unsigned char s[4];
switch (channels) {
@@ -590,7 +590,7 @@ static int init(int rate_hz, int channels, int format, int flags)
"alsa-init: format %s are not supported by hardware, trying default\n",
audio_out_format_name(format));
alsa_format = SND_PCM_FORMAT_S16_LE;
- ao_data.format = AFMT_S16_LE;
+ ao_data.format = AF_FORMAT_S16_LE;
ao_data.bps = channels * rate_hz * 2;
}