Mercurial > mplayer.hg
diff libao2/audio_out.c @ 3095:981a9e5118ce
interface to libao2 changed ao_plugin added
author | anders |
---|---|
date | Sat, 24 Nov 2001 05:21:22 +0000 |
parents | 7345a10e6012 |
children | e279cc05f189 |
line wrap: on
line diff
--- a/libao2/audio_out.c Sat Nov 24 02:05:06 2001 +0000 +++ b/libao2/audio_out.c Sat Nov 24 05:21:22 2001 +0000 @@ -6,19 +6,12 @@ #include "afmt.h" // there are some globals: -int ao_samplerate=0; -int ao_channels=0; -int ao_format=0; -int ao_bps=0; -int ao_outburst=OUTBURST; // config.h default -int ao_buffersize=-1; -int ao_pts=0; +ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0}; char *ao_subdevice = NULL; #ifdef USE_OSS_AUDIO extern ao_functions_t audio_out_oss; #endif -//extern ao_functions_t audio_out_ossold; extern ao_functions_t audio_out_null; #ifdef HAVE_ALSA5 extern ao_functions_t audio_out_alsa5; @@ -42,10 +35,9 @@ extern ao_functions_t audio_out_dxr3; #endif extern ao_functions_t audio_out_pcm; -#ifndef USE_LIBVO2 extern ao_functions_t audio_out_mpegpes; -#endif extern ao_functions_t audio_out_pss; +extern ao_functions_t audio_out_plugin; ao_functions_t* audio_out_drivers[] = { @@ -75,9 +67,11 @@ &audio_out_dxr3, #endif &audio_out_pcm, -#ifndef USE_LIBVO2 &audio_out_mpegpes, -#endif + &audio_out_plugin, // &audio_out_pss, NULL }; + + +