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_sdl.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_sdl.c')
-rw-r--r-- | libao2/ao_sdl.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c index 73a2c05a3d..bc2db2e258 100644 --- a/libao2/ao_sdl.c +++ b/libao2/ao_sdl.c @@ -20,7 +20,7 @@ #include "audio_out.h" #include "audio_out_internal.h" -#include "afmt.h" +#include "libaf/af_format.h" #include <SDL.h> #include "osdep/timer.h" @@ -181,7 +181,7 @@ static int init(int rate,int channels,int format,int flags){ /* Allocate ring-buffer memory */ buffer = (unsigned char *) malloc(BUFFSIZE); - mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_SDL_INFO, rate, (channels > 1) ? "Stereo" : "Mono", audio_out_format_name(format)); +// mp_msg(MSGT_AO,MSGL_INFO,MSGTR_AO_SDL_INFO, rate, (channels > 1) ? "Stereo" : "Mono", audio_out_format_name(format)); if(ao_subdevice) { setenv("SDL_AUDIODRIVER", ao_subdevice, 1); @@ -193,32 +193,32 @@ static int init(int rate,int channels,int format,int flags){ ao_data.format=format; ao_data.bps=channels*rate; - if(format != AFMT_U8 && format != AFMT_S8) + if(format != AF_FORMAT_U8 && format != AF_FORMAT_S8) ao_data.bps*=2; /* The desired audio format (see SDL_AudioSpec) */ switch(format) { - case AFMT_U8: + case AF_FORMAT_U8: aspec.format = AUDIO_U8; break; - case AFMT_S16_LE: + case AF_FORMAT_S16_LE: aspec.format = AUDIO_S16LSB; break; - case AFMT_S16_BE: + case AF_FORMAT_S16_BE: aspec.format = AUDIO_S16MSB; break; - case AFMT_S8: + case AF_FORMAT_S8: aspec.format = AUDIO_S8; break; - case AFMT_U16_LE: + case AF_FORMAT_U16_LE: aspec.format = AUDIO_U16LSB; break; - case AFMT_U16_BE: + case AF_FORMAT_U16_BE: aspec.format = AUDIO_U16MSB; break; default: aspec.format = AUDIO_S16LSB; - ao_data.format = AFMT_S16_LE; + ao_data.format = AF_FORMAT_S16_LE; mp_msg(MSGT_AO,MSGL_WARN,MSGTR_AO_SDL_UnsupportedAudioFmt, format); } @@ -256,22 +256,22 @@ void callback(void *userdata, Uint8 *stream, int len); userdata is the pointer s switch(obtained.format) { case AUDIO_U8 : - ao_data.format = AFMT_U8; + ao_data.format = AF_FORMAT_U8; break; case AUDIO_S16LSB : - ao_data.format = AFMT_S16_LE; + ao_data.format = AF_FORMAT_S16_LE; break; case AUDIO_S16MSB : - ao_data.format = AFMT_S16_BE; + ao_data.format = AF_FORMAT_S16_BE; break; case AUDIO_S8 : - ao_data.format = AFMT_S8; + ao_data.format = AF_FORMAT_S8; break; case AUDIO_U16LSB : - ao_data.format = AFMT_U16_LE; + ao_data.format = AF_FORMAT_U16_LE; break; case AUDIO_U16MSB : - ao_data.format = AFMT_U16_BE; + ao_data.format = AF_FORMAT_U16_BE; break; default: mp_msg(MSGT_AO,MSGL_WARN,MSGTR_AO_SDL_UnsupportedAudioFmt, obtained.format); |