Mercurial > mplayer.hg
changeset 7609:2ac457fb9c8c
10l
| author | arpi |
|---|---|
| date | Sun, 06 Oct 2002 01:08:04 +0000 |
| parents | e1962f1bb326 |
| children | 876495f714dc |
| files | libao2/ao_mpegpes.c libao2/audio_out.c |
| diffstat | 2 files changed, 18 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/ao_mpegpes.c Sun Oct 06 00:46:47 2002 +0000 +++ b/libao2/ao_mpegpes.c Sun Oct 06 01:08:04 2002 +0000 @@ -17,9 +17,9 @@ #ifdef HAVE_DVB #include <ost/audio.h> audioMixer_t dvb_mixer={255,255}; +#endif extern int vo_mpegpes_fd; extern int vo_mpegpes_fd2; -#endif #include <errno.h>
--- a/libao2/audio_out.c Sun Oct 06 00:46:47 2002 +0000 +++ b/libao2/audio_out.c Sun Oct 06 01:08:04 2002 +0000 @@ -25,9 +25,6 @@ #ifdef HAVE_ALSA9 extern ao_functions_t audio_out_alsa9; #endif -#ifdef HAVE_ESD - extern ao_functions_t audio_out_esd; -#endif #ifdef HAVE_NAS extern ao_functions_t audio_out_nas; #endif @@ -50,30 +47,30 @@ ao_functions_t* audio_out_drivers[] = { +// vo-related: will fail unless you also do -vo mpegpes/dxr2 + &audio_out_mpegpes, +#ifdef HAVE_DXR2 + &audio_out_dxr2, +#endif +// native: #ifdef USE_OSS_AUDIO &audio_out_oss, #endif -#ifdef USE_ARTS - &audio_out_arts, +#ifdef HAVE_ALSA9 + &audio_out_alsa9, #endif -#ifdef USE_SUN_AUDIO - &audio_out_sun, +#ifdef HAVE_ALSA5 + &audio_out_alsa5, #endif #ifdef USE_SGI_AUDIO &audio_out_sgi, #endif -#ifdef HAVE_DXR2 - &audio_out_dxr2, +#ifdef USE_SUN_AUDIO + &audio_out_sun, #endif - &audio_out_null, -#ifdef HAVE_ALSA5 - &audio_out_alsa5, -#endif -#ifdef HAVE_ALSA9 - &audio_out_alsa9, -#endif -#ifdef HAVE_ESD - &audio_out_esd, +// wrappers: +#ifdef USE_ARTS + &audio_out_arts, #endif #ifdef HAVE_NAS &audio_out_nas, @@ -81,10 +78,10 @@ #ifdef HAVE_SDL &audio_out_sdl, #endif - &audio_out_mpegpes, + &audio_out_null, +// should not be auto-selected: &audio_out_pcm, &audio_out_plugin, -// &audio_out_pss, NULL };