[Mplayer-cvslog] CVS: main cfg-mencoder.h,1.38,1.39 mencoder.c,1.123,1.124

[Arpi of Ize]

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

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
volume setting with lame - patch by silicon at falcon.sch.bme.hu

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- cfg-mencoder.h	21 Apr 2002 23:13:52 -0000	1.38
+++ cfg-mencoder.h	26 Apr 2002 20:17:15 -0000	1.39
@@ -30,6 +30,7 @@
 	{"padding", &lame_param_padding, CONF_TYPE_INT, CONF_RANGE, 0, PAD_MAX_INDICATOR, NULL},
 	{"br", &lame_param_br, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
 	{"ratio", &lame_param_ratio, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
+	{"vol", &lame_param_scale, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10, NULL},
 	{"help", "TODO: lameopts help!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- mencoder.c	18 Apr 2002 17:28:48 -0000	1.123
+++ mencoder.c	26 Apr 2002 20:17:15 -0000	1.124
@@ -179,6 +179,7 @@
 int lame_param_padding=-1; // unset
 int lame_param_br=-1; // unset
 int lame_param_ratio=-1; // unset
+float lame_param_scale=-1; // unset
 #endif
 
 static int vo_w=0, vo_h=0;
@@ -751,6 +752,10 @@
 }
 if(lame_param_mode>=0) lame_set_mode(lame,lame_param_mode); // j-st
 if(lame_param_ratio>0) lame_set_compression_ratio(lame,lame_param_ratio);
+if(lame_param_scale>0) {
+    printf("Setting audio input gain to %f\n", lame_param_scale);
+    lame_set_scale(lame,lame_param_scale);
+}
 lame_init_params(lame);
 if(verbose){
     lame_print_config(lame);