diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
| commit | 507121f7fe2d170dd8db99d3112602036ddef718 (patch) | |
| tree | 38b26e115cfadde356b005496286f78307839440 /libao2/ao_arts.c | |
| parent | 00f99a82a8f57573e3e6982cf9d014c9b9d8a68b (diff) | |
| download | mpv-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_arts.c')
| -rw-r--r-- | libao2/ao_arts.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c index 8d2918d74f..ad19b9845b 100644 --- a/libao2/ao_arts.c +++ b/libao2/ao_arts.c @@ -12,12 +12,12 @@ #include "audio_out.h" #include "audio_out_internal.h" -#include "afmt.h" +#include "libaf/af_format.h" #include "config.h" #include "mp_msg.h" #include "help_mp.h" -#define OBTAIN_BITRATE(a) (((a != AFMT_U8) && (a != AFMT_S8)) ? 16 : 8) +#define OBTAIN_BITRATE(a) (((a != AF_FORMAT_U8) && (a != AF_FORMAT_S8)) ? 16 : 8) /* Feel free to experiment with the following values: */ #define ARTS_PACKETS 10 /* Number of audio packets */ @@ -60,12 +60,12 @@ static int init(int rate_hz, int channels, int format, int flags) * using mplayer's audio filters. */ switch (format) { - case AFMT_U8: - case AFMT_S8: - format = AFMT_U8; + case AF_FORMAT_U8: + case AF_FORMAT_S8: + format = AF_FORMAT_U8; break; default: - format = AFMT_S16_LE; /* artsd always expects little endian?*/ + format = AF_FORMAT_S16_LE; /* artsd always expects little endian?*/ break; } @@ -74,7 +74,7 @@ static int init(int rate_hz, int channels, int format, int flags) ao_data.samplerate = rate_hz; ao_data.bps = (rate_hz*channels); - if(format != AFMT_U8 && format != AFMT_S8) + if(format != AF_FORMAT_U8 && format != AF_FORMAT_S8) ao_data.bps*=2; stream=arts_play_stream(rate_hz, OBTAIN_BITRATE(format), channels, "MPlayer"); |