From 507121f7fe2d170dd8db99d3112602036ddef718 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 27 Dec 2004 17:30:15 +0000 Subject: removing AFMT_ dependancy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_pcm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libao2/ao_pcm.c') diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c index d1cf65f2a0..609f79c9f0 100644 --- a/libao2/ao_pcm.c +++ b/libao2/ao_pcm.c @@ -5,7 +5,7 @@ #include #include "bswap.h" -#include "afmt.h" +#include "libaf/af_format.h" #include "audio_out.h" #include "audio_out_internal.h" #include "mp_msg.h" @@ -89,12 +89,12 @@ static int init(int rate,int channels,int format,int flags){ bits=8; switch(format){ - case AFMT_S8: - format=AFMT_U8; - case AFMT_U8: + case AF_FORMAT_S8: + format=AF_FORMAT_U8; + case AF_FORMAT_U8: break; default: - format=AFMT_S16_LE; + format=AF_FORMAT_S16_LE; bits=16; break; } @@ -114,9 +114,9 @@ static int init(int rate,int channels,int format,int flags){ wavhdr.data_length=le2me_32(0x7ffff000); wavhdr.file_length = wavhdr.data_length + sizeof(wavhdr) - 8; - mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_PCM_FileInfo, ao_outputfilename, - (ao_pcm_waveheader?"WAVE":"RAW PCM"), rate, - (channels > 1) ? "Stereo" : "Mono", audio_out_format_name(format)); +// mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_PCM_FileInfo, ao_outputfilename, +// (ao_pcm_waveheader?"WAVE":"RAW PCM"), rate, +// (channels > 1) ? "Stereo" : "Mono", audio_out_format_name(format)); mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_PCM_HintInfo); fp = fopen(ao_outputfilename, "wb"); -- cgit v1.2.3