diff options
| author | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-24 05:21:22 +0000 |
|---|---|---|
| committer | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-24 05:21:22 +0000 |
| commit | 242aa6ebd4061b1b2b3651cc0887083206932a7d (patch) | |
| tree | 507fde939a2c58eb0f0317aecf3c1e637aedd163 /libao2/audio_out.c | |
| parent | becadec644aa84b399c9b1dbacfcdd486b45fd32 (diff) | |
| download | mpv-242aa6ebd4061b1b2b3651cc0887083206932a7d.tar.bz2 mpv-242aa6ebd4061b1b2b3651cc0887083206932a7d.tar.xz | |
interface to libao2 changed ao_plugin added
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3096 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/audio_out.c')
| -rw-r--r-- | libao2/audio_out.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index f1f9921900..3a09cf85fb 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -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_sgi; 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 @@ ao_functions_t* audio_out_drivers[] = &audio_out_dxr3, #endif &audio_out_pcm, -#ifndef USE_LIBVO2 &audio_out_mpegpes, -#endif + &audio_out_plugin, // &audio_out_pss, NULL }; + + + |