summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 19:34:42 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 19:34:42 +0000
commit0fdaa5ab30c0da6f9005a72e8e35b2c6cba00a49 (patch)
tree1d308edf5b4ea2f233e8dc4a837dae55774d152a /libao2/audio_out.c
parentbd6b315f6b18dbb67ce11a4909bda4ef01d0fedd (diff)
downloadmpv-0fdaa5ab30c0da6f9005a72e8e35b2c6cba00a49.tar.bz2
mpv-0fdaa5ab30c0da6f9005a72e8e35b2c6cba00a49.tar.xz
Do not use audio plugins anymore
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14255 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r--libao2/audio_out.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 0bd37ad555..cbb04379fc 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -64,7 +64,6 @@ extern ao_functions_t audio_out_dxr2;
extern ao_functions_t audio_out_mpegpes;
extern ao_functions_t audio_out_pcm;
extern ao_functions_t audio_out_pss;
-extern ao_functions_t audio_out_plugin;
ao_functions_t* audio_out_drivers[] =
{
@@ -123,7 +122,6 @@ ao_functions_t* audio_out_drivers[] =
&audio_out_null,
// should not be auto-selected:
&audio_out_pcm,
- &audio_out_plugin,
NULL
};
@@ -163,10 +161,6 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c
ao_functions_t* audio_out=audio_out_drivers[i];
if(!strncmp(audio_out->info->short_name,ao,ao_len)){
// name matches, try it
- if(use_plugin){
- audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,audio_out);
- audio_out=&audio_out_plugin;
- }
if(audio_out->init(rate,channels,format,flags))
return audio_out; // success!
}
@@ -182,10 +176,6 @@ ao_functions_t* init_best_audio_out(char** ao_list,int use_plugin,int rate,int c
// now try the rest...
for(i=0;audio_out_drivers[i];i++){
ao_functions_t* audio_out=audio_out_drivers[i];
- if(use_plugin){
- audio_out_plugin.control(AOCONTROL_SET_PLUGIN_DRIVER,audio_out);
- audio_out=&audio_out_plugin;
- }
// if(audio_out->control(AOCONTROL_QUERY_FORMAT, (int)format) == CONTROL_TRUE)
if(audio_out->init(rate,channels,format,flags))
return audio_out; // success!