[Mplayer-cvslog] CVS: main cfg-mplayer.h, 1.211, 1.212 mixer.c, 1.14, 1.15 mixer.h, 1.4, 1.5

[Attila Kinali CVS]

Update of /cvsroot/mplayer/main
In directory mail:/tmp/cvs-serv31758

Modified Files:
	cfg-mplayer.h mixer.c mixer.h 
Log Message:
add option to select mixer channel
patch by Catalin Muresan <catalin.muresan at astral.ro>


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- cfg-mplayer.h	8 Dec 2003 09:32:40 -0000	1.211
+++ cfg-mplayer.h	24 Jan 2004 11:53:52 -0000	1.212
@@ -188,6 +188,7 @@
 	{"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 	{"dsp", "Use -ao oss:dsp_path!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
         {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0, NULL},
+        {"mixer-channel", &mixer_channel, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"master", "Option -master has been removed, use -aop list=volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},
 	// override audio buffer size (used only by -ao oss, anyway obsolete...)
 	{"abs", &ao_data.buffersize, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL},

Index: mixer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mixer.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mixer.c	31 Mar 2003 17:32:46 -0000	1.14
+++ mixer.c	24 Jan 2004 11:53:52 -0000	1.15
@@ -14,6 +14,7 @@
 extern ao_functions_t *audio_out;
 
 char * mixer_device=NULL;
+char * mixer_channel=NULL;
 
 int muted = 0;
 float mute_l = 0.0f;

Index: mixer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mixer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mixer.h	6 Jun 2002 07:13:42 -0000	1.4
+++ mixer.h	24 Jan 2004 11:53:52 -0000	1.5
@@ -3,6 +3,7 @@
 #define __MPLAYER_MIXER
 
 extern char * mixer_device;
+extern char * mixer_channel;
 extern int    muted;
 
 extern void mixer_getvolume( float *l,float *r );