[Mplayer-cvslog] CVS: main cfg-common.h,1.82,1.83 cfg-mplayer.h,1.196,1.197

[Arpi of Ize]

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

Modified Files:
	cfg-common.h cfg-mplayer.h 
Log Message:
1000l (af moved to common)


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- cfg-common.h	27 Jan 2003 23:41:38 -0000	1.82
+++ cfg-common.h	8 Feb 2003 20:52:25 -0000	1.83
@@ -121,6 +121,9 @@
 	{"sound", &audio_id, CONF_TYPE_FLAG, 0, -2, -1, NULL},
 	{"nosound", &audio_id, CONF_TYPE_FLAG, 0, -1, -2, NULL},
 
+	{"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+	{"af", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
+
 	// select audio/video codec (by name) or codec family (by number):
 //	{"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 22, NULL}, // keep ranges in sync
 //	{"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 29, NULL}, // with codec-cfg.c
@@ -340,6 +343,14 @@
 };
 						
 extern char** vo_plugin_args;
+
+#include "libaf/af.h"
+extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
+struct config audio_filter_conf[]={       
+	{"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
+        {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
+	{NULL, NULL, 0, 0, 0, 0, NULL}
+};
 
 #ifdef USE_LIBAVCODEC
 extern struct config lavc_decode_opts_conf[];

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- cfg-mplayer.h	8 Feb 2003 10:11:05 -0000	1.196
+++ cfg-mplayer.h	8 Feb 2003 20:52:25 -0000	1.197
@@ -126,14 +126,6 @@
 /* from libvo/aspect.c */
 extern float monitor_aspect;
 
-#include "libaf/af.h"
-extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
-struct config audio_filter_conf[]={       
-	{"list", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
-        {"force", &af_cfg.force, CONF_TYPE_INT, CONF_RANGE, 0, 7, NULL},
-	{NULL, NULL, 0, 0, 0, 0, NULL}
-};
-
 /* Options related to audio out plugins */
 struct config ao_plugin_conf[]={
 	{"list", &ao_plugin_cfg.plugin_list, CONF_TYPE_STRING, 0, 0, 0, NULL},
@@ -190,8 +182,6 @@
 	{"fixed-vo", &fixed_vo, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 
 	{"aop", ao_plugin_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-	{"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
-	{"af", &af_cfg.list, CONF_TYPE_STRING_LIST, 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},
 	{"master", "Option -master has been removed, use -aop list=volume instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL},