[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.105,1.106 mplayer.c,1.328,1.329

[Anders Johansson]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv18624

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
commandline configuration of audio plugins now through struct, format conversion plugin added

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- cfg-mplayer.h	28 Nov 2001 12:43:13 -0000	1.105
+++ cfg-mplayer.h	29 Nov 2001 12:44:00 -0000	1.106
@@ -68,9 +68,6 @@
 extern int use_old_pp;
 #endif
 
-// From audio plugins
-extern int pl_delay_len;
-
 /* from libvo/aspect.c */
 extern float monitor_aspect;
 
@@ -100,8 +97,8 @@
 	{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
 	// -----options related to audio and audio plugins-------
 	{"ao", &audio_driver, CONF_TYPE_STRING, 0, 0, 0},
-	{"aop", &audio_plugins, CONF_TYPE_STRING, 0, 0, 0},
-	{"aop_delay", &pl_delay_len, CONF_TYPE_INT, CONF_MIN, 0, 0},
+	{"aop", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0},
+	{"aop_delay", &ao_plugin_cfg.pl_delay_len, CONF_TYPE_INT, CONF_MIN, 0, 0},
 //	{"dsp", &dsp, CONF_TYPE_STRING, CONF_NOCFG, 0, 0},
 	{"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
         {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -r1.328 -r1.329
--- mplayer.c	28 Nov 2001 12:44:38 -0000	1.328
+++ mplayer.c	29 Nov 2001 12:44:00 -0000	1.329
@@ -46,6 +46,7 @@
 #endif
 
 #include "libao2/audio_out.h"
+#include "libao2/audio_plugin.h"
 
 #include "libmpeg2/mpeg2.h"
 #include "libmpeg2/mpeg2_internal.h"
@@ -218,7 +219,6 @@
 // screen info:
 char* video_driver=NULL; //"mga"; // default
 char* audio_driver=NULL;
-char* audio_plugins=NULL;
 static int fullscreen=0;
 static int vidmode=0;
 static int softzoom=0;
@@ -763,12 +763,11 @@
     exit_player(MSGTR_Exit_error);
   }
   /* Initailize audio plugin interface if used */
-  if(audio_plugins){
+  if(ao_plugin_cfg.plugin_list){
     for (i=0; audio_out_drivers[i] != NULL; i++){
       const ao_info_t *info = audio_out_drivers[i]->info;
       if(strcmp(info->short_name,"plugin") == 0){
 	audio_out_drivers[i]->control(AOCONTROL_SET_PLUGIN_DRIVER,(int)audio_out);
-	audio_out_drivers[i]->control(AOCONTROL_SET_PLUGIN_LIST,(int)audio_plugins);
 	audio_out = audio_out_drivers[i];
 	break;
       }