[MPlayer-dev-eng] [PATCH] don't use unsupported audio plugins, use all plugins (bugfix)

[Christian Ohm]

hi.

accordign to arpi's suggestion i made a patch that just disables those
plugins that can't handle the audio format. it also fixes a bug (and i'm
pretty sure this _is_ a bug) where, when playing multiple files, after the
first file only the first audio plugin is used.

bye
christian ohm

-- 
Gordon's Law:
	If you think you have the solution, the question was poorly phrased.
-------------- next part --------------
Index: libao2/ao_plugin.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_plugin.c,v
retrieving revision 1.17
diff -u -r1.17 ao_plugin.c
--- libao2/ao_plugin.c	9 May 2002 07:41:25 -0000	1.17
+++ libao2/ao_plugin.c	26 May 2002 00:17:00 -0000
@@ -115,13 +115,20 @@
 // open & setup audio device and plugins
 // return: 1=success 0=fail
 static int init(int rate,int channels,int format,int flags){
+  int use_plugin[NPL];
+  int x,npl,unused=0;
   int ok=1;
+  char *config;
 
   // Create list of plugins from cfg option
   int i=0; 
   if(ao_plugin_cfg.plugin_list){
-    if(!add_plugin(i,ao_plugin_cfg.plugin_list))
+    config = malloc(strlen(ao_plugin_cfg.plugin_list));
+    if (!strcpy(config, ao_plugin_cfg.plugin_list))
       return 0;
+    if(!add_plugin(i,config))
+      return 0;
+    free(config);
   }
 
   /* Set input parameters and itterate through plugins each plugin
@@ -138,11 +145,21 @@
   ao_plugin_data.sz_fix=0;
   ao_plugin_data.delay_mult=1;
   ao_plugin_data.delay_fix=0;
-  i=0;
-  while(plugin(i)&&ok)
-    ok=plugin(i++)->init();
-  
-  if(!ok) return 0;
+
+  for(i=0;i<NPL,plugin(i);i++){
+    use_plugin[i]=plugin(i)->init();
+    if(!use_plugin[i]) plugin(i)->uninit();
+  }
+  npl=i;
+  for(i=0;i<npl,plugin(i);i++)
+    if(!use_plugin[i+unused]){
+      unused++;
+      for(x=i;x<npl,plugin(x+1);x++) plugin(x)=plugin(x+1);
+      plugin(x)=NULL;
+      npl--;
+      i--;
+    }
+  i=npl;
 
   // Calculate bps
   ao_plugin_local_data.bps=(float)(ao_plugin_data.rate *