[Mplayer-cvslog] CVS: main/libao2 ao_oss.c,1.27,1.28 audio_out.h,1.9,1.10 audio_plugin.h,1.11,1.12 pl_extrastereo.c,1.1,1.2

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv4843

Modified Files:
	ao_oss.c audio_out.h audio_plugin.h pl_extrastereo.c 
Log Message:


- add some control (ao_oss, pl_extrastereo)
- cosmetic


Index: ao_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ao_oss.c	28 Jun 2002 16:42:32 -0000	1.27
+++ ao_oss.c	25 Jul 2002 20:28:47 -0000	1.28
@@ -46,6 +46,9 @@
 	case AOCONTROL_SET_DEVICE:
 	    dsp=(char*)arg;
 	    return CONTROL_OK;
+	case AOCONTROL_GET_DEVICE:
+	    (char*)arg=dsp;
+	    return CONTROL_OK;
 	case AOCONTROL_QUERY_FORMAT:
 	    return CONTROL_TRUE;
 	case AOCONTROL_GET_VOLUME:

Index: audio_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- audio_out.h	9 May 2002 07:39:33 -0000	1.9
+++ audio_out.h	25 Jul 2002 20:28:47 -0000	1.10
@@ -1,3 +1,7 @@
+
+#ifndef __AUDIO_OUT_H
+#define __AUDIO_OUT_H
+
 typedef struct ao_info_s
 {
         /* driver name ("Matrox Millennium G200/G400" */
@@ -68,4 +72,4 @@
 	float right;
 } ao_control_vol_t;
 
-
+#endif

Index: audio_plugin.h
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_plugin.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- audio_plugin.h	15 Jun 2002 06:15:07 -0000	1.11
+++ audio_plugin.h	25 Jul 2002 20:28:47 -0000	1.12
@@ -83,6 +83,8 @@
 
 // Control parameters used by the plugins
 #define AOCONTROL_PLUGIN_SET_LEN 1  // All plugins must respond to this parameter
+#define AOCONTROL_PLUGIN_ES_SET  4  // set extra stereo coefficient
+#define AOCONTROL_PLUGIN_ES_GET  5  // get extra stereo coefficient
 
 #endif
 

Index: pl_extrastereo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/pl_extrastereo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pl_extrastereo.c	3 Mar 2002 14:17:53 -0000	1.1
+++ pl_extrastereo.c	25 Jul 2002 20:28:47 -0000	1.2
@@ -33,8 +33,8 @@
 // local data
 static struct {
   float    mul;         // intensity
-  int      inuse;     	// This plugin is in use TRUE, FALSE
-  int      format;	// sample format
+  int      inuse;      // This plugin is in use TRUE, FALSE
+  int      format;     // sample format
 } pl_extrastereo = {2.5, 0, 0};
 
 
@@ -42,6 +42,12 @@
 static int control(int cmd,int arg){
   switch(cmd){
   case AOCONTROL_PLUGIN_SET_LEN:
+    return CONTROL_OK;
+  case AOCONTROL_PLUGIN_ES_SET:
+    pl_extrastereo.mul=*((float*)arg);
+    return CONTROL_OK;
+  case AOCONTROL_PLUGIN_ES_GET:
+    *((float*)arg)=pl_extrastereo.mul;
     return CONTROL_OK;
   }
   return CONTROL_UNKNOWN;