comparison libao2/ao_macosx.c @ 14245:815f03b7cee5

removing AFMT_ dependancy
author alex
date Mon, 27 Dec 2004 17:30:15 +0000
parents a92101a7eb49
children 488651c51aa3
comparison
equal deleted inserted replaced
14244:9b03ad0254ae 14245:815f03b7cee5
45 45
46 #include "mp_msg.h" 46 #include "mp_msg.h"
47 47
48 #include "audio_out.h" 48 #include "audio_out.h"
49 #include "audio_out_internal.h" 49 #include "audio_out_internal.h"
50 #include "afmt.h" 50 #include "libaf/af_format.h"
51 51
52 static ao_info_t info = 52 static ao_info_t info =
53 { 53 {
54 "Darwin/Mac OS X native audio output", 54 "Darwin/Mac OS X native audio output",
55 "macosx", 55 "macosx",
250 ao_data.samplerate * ao->outputStreamBasicDescription.mBytesPerFrame; 250 ao_data.samplerate * ao->outputStreamBasicDescription.mBytesPerFrame;
251 251
252 if (ao->outputStreamBasicDescription.mFormatID == kAudioFormatLinearPCM) { 252 if (ao->outputStreamBasicDescription.mFormatID == kAudioFormatLinearPCM) {
253 uint32_t flags = ao->outputStreamBasicDescription.mFormatFlags; 253 uint32_t flags = ao->outputStreamBasicDescription.mFormatFlags;
254 if (flags & kAudioFormatFlagIsFloat) { 254 if (flags & kAudioFormatFlagIsFloat) {
255 ao_data.format = AFMT_FLOAT; 255 ao_data.format = AF_FORMAT_FLOAT_NE;
256 } else { 256 } else {
257 ao_msg(MSGT_AO,MSGL_WARN, "Unsupported audio output " 257 ao_msg(MSGT_AO,MSGL_WARN, "Unsupported audio output "
258 "format %d. Please report this to the developer\n", 258 "format %d. Please report this to the developer\n",
259 (int)status); 259 (int)status);
260 return CONTROL_FALSE; 260 return CONTROL_FALSE;