diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-03-07 01:04:41 +0200 |
| commit | e0172b96e3b6cc6a8b62ee5a52f780941a43de8b (patch) | |
| tree | f652f6d15740667d5434e526db3fd12a0573aa0f /libao2/audio_out.c | |
| parent | 0c6f667896620943ee6ae899d6e36c3da5c98c54 (diff) | |
| parent | 7e253f01715811e0c4f5f5b54317b098f2cd59d9 (diff) | |
| download | mpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.bz2 mpv-e0172b96e3b6cc6a8b62ee5a52f780941a43de8b.tar.xz | |
Merge svn changes up to r28862
Diffstat (limited to 'libao2/audio_out.c')
| -rw-r--r-- | libao2/audio_out.c | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c index ee62ebc016..8c64abbb95 100644 --- a/libao2/audio_out.c +++ b/libao2/audio_out.c @@ -30,28 +30,29 @@ ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0}; char *ao_subdevice = NULL; -extern ao_functions_t audio_out_oss; -extern ao_functions_t audio_out_macosx; -extern ao_functions_t audio_out_arts; -extern ao_functions_t audio_out_esd; -extern ao_functions_t audio_out_pulse; -extern ao_functions_t audio_out_jack; -extern ao_functions_t audio_out_openal; -extern ao_functions_t audio_out_null; -extern ao_functions_t audio_out_alsa5; -extern ao_functions_t audio_out_alsa; -extern ao_functions_t audio_out_nas; -extern ao_functions_t audio_out_sdl; -extern ao_functions_t audio_out_sun; -extern ao_functions_t audio_out_sgi; -extern ao_functions_t audio_out_win32; -extern ao_functions_t audio_out_dsound; -extern ao_functions_t audio_out_dxr2; -extern ao_functions_t audio_out_ivtv; -extern ao_functions_t audio_out_v4l2; -extern ao_functions_t audio_out_mpegpes; -extern ao_functions_t audio_out_pcm; -extern ao_functions_t audio_out_pss; +extern const ao_functions_t audio_out_oss; +extern const ao_functions_t audio_out_macosx; +extern const ao_functions_t audio_out_arts; +extern const ao_functions_t audio_out_esd; +extern const ao_functions_t audio_out_pulse; +extern const ao_functions_t audio_out_jack; +extern const ao_functions_t audio_out_openal; +extern const ao_functions_t audio_out_null; +extern const ao_functions_t audio_out_alsa5; +extern const ao_functions_t audio_out_alsa; +extern const ao_functions_t audio_out_nas; +extern const ao_functions_t audio_out_sdl; +extern const ao_functions_t audio_out_sun; +extern const ao_functions_t audio_out_sgi; +extern const ao_functions_t audio_out_win32; +extern const ao_functions_t audio_out_dsound; +extern const ao_functions_t audio_out_dart; +extern const ao_functions_t audio_out_dxr2; +extern const ao_functions_t audio_out_ivtv; +extern const ao_functions_t audio_out_v4l2; +extern const ao_functions_t audio_out_mpegpes; +extern const ao_functions_t audio_out_pcm; +extern const ao_functions_t audio_out_pss; const ao_functions_t* const audio_out_drivers[] = { @@ -62,6 +63,9 @@ const ao_functions_t* const audio_out_drivers[] = #ifdef CONFIG_WIN32WAVEOUT &audio_out_win32, #endif +#ifdef CONFIG_DART + &audio_out_dart, +#endif #ifdef CONFIG_COREAUDIO &audio_out_macosx, #endif |