Mercurial > mplayer.hg

comparison libao2/ao_nas.c @ 14245:815f03b7cee5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing AFMT_ dependancy
author alex
date Mon, 27 Dec 2004 17:30:15 +0000
parents a92101a7eb49
children 1e16a8e3735b
comparison
equal deleted inserted replaced
14244:9b03ad0254ae 14245:815f03b7cee5
35 35
36 #include "mp_msg.h" 36 #include "mp_msg.h"
37 37
38 #include "audio_out.h" 38 #include "audio_out.h"
39 #include "audio_out_internal.h" 39 #include "audio_out_internal.h"
40 #include "afmt.h" 40 #include "libaf/af_format.h"
41 41
42 #define NAS_FRAG_SIZE 4096 42 #define NAS_FRAG_SIZE 4096
43 43
44 static char *nas_event_types[] = { 44 static char *nas_event_types[] = {
45 "Undefined", 45 "Undefined",
310 } 310 }
311 311
312 static unsigned int nas_aformat_to_auformat(unsigned int *format) 312 static unsigned int nas_aformat_to_auformat(unsigned int *format)
313 { 313 {
314 switch (*format) { 314 switch (*format) {
315 case AFMT_U8: 315 case AF_FORMAT_U8:
316 return AuFormatLinearUnsigned8; 316 return AuFormatLinearUnsigned8;
317 case AFMT_S8: 317 case AF_FORMAT_S8:
318 return AuFormatLinearSigned8; 318 return AuFormatLinearSigned8;
319 case AFMT_U16_LE: 319 case AF_FORMAT_U16_LE:
320 return AuFormatLinearUnsigned16LSB; 320 return AuFormatLinearUnsigned16LSB;
321 case AFMT_U16_BE: 321 case AF_FORMAT_U16_BE:
322 return AuFormatLinearUnsigned16MSB; 322 return AuFormatLinearUnsigned16MSB;
323 case AFMT_S16_LE: 323 case AF_FORMAT_S16_LE:
324 return AuFormatLinearSigned16LSB; 324 return AuFormatLinearSigned16LSB;
325 case AFMT_S16_BE: 325 case AF_FORMAT_S16_BE:
326 return AuFormatLinearSigned16MSB; 326 return AuFormatLinearSigned16MSB;
327 case AFMT_MU_LAW: 327 case AF_FORMAT_MU_LAW:
328 return AuFormatULAW8; 328 return AuFormatULAW8;
329 default: 329 default:
330 *format=AFMT_S16_NE; 330 *format=AF_FORMAT_S16_NE;
331 return nas_aformat_to_auformat(format); 331 return nas_aformat_to_auformat(format);
332 } 332 }
333 } 333 }
334 334
335 // to set/get/query special features/parameters 335 // to set/get/query special features/parameters