[Mplayer-cvslog] CVS: main mplayer.c,1.324,1.325 cfg-mplayer.h,1.103,1.104

[Anders Johansson]

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

Modified Files:
	mplayer.c cfg-mplayer.h 
Log Message:
Changes to audio out plugin, first plugin added

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- mplayer.c	24 Nov 2001 05:29:56 -0000	1.324
+++ mplayer.c	25 Nov 2001 14:29:50 -0000	1.325
@@ -216,6 +216,7 @@
 // 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;
@@ -757,7 +758,20 @@
     mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_InvalidAOdriver,audio_driver);
     exit_player(MSGTR_Exit_error);
   }
-/*DSP!!  if(dsp) audio_out->control(AOCONTROL_SET_DEVICE,(int)dsp);*/
+  /* Initailize audio plugin interface if used */
+  if(audio_plugins){
+    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;
+      }
+    }
+  }
+
+    
 
   current_module="spudec";
   vo_spudec=spudec_new();

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- cfg-mplayer.h	24 Nov 2001 05:29:56 -0000	1.103
+++ cfg-mplayer.h	25 Nov 2001 14:29:50 -0000	1.104
@@ -68,6 +68,8 @@
 extern int use_old_pp;
 #endif
 
+// From audio plugins
+extern int pl_delay_len;
 
 /* from libvo/aspect.c */
 extern float monitor_aspect;
@@ -93,7 +95,10 @@
 	{"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
             CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 	{"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},
 //	{"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},