[Mplayer-cvslog] CVS: main cfg-common.h,1.60,1.61 mencoder.c,1.169,1.170 mplayer.c,1.579,1.580 mplayer.h,1.17,1.18

[Arpi of Ize]

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

Modified Files:
	cfg-common.h mencoder.c mplayer.c mplayer.h 
Log Message:
removed obsolete/unused audio|video_fm|codec, has_audio|video


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- cfg-common.h	28 Sep 2002 02:23:17 -0000	1.60
+++ cfg-common.h	28 Sep 2002 18:45:47 -0000	1.61
@@ -100,8 +100,8 @@
 #endif
 
 	// disable audio
-	{"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1, NULL},
-	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+	{"sound", &audio_id, CONF_TYPE_FLAG, 0, -2, -1, NULL},
+	{"nosound", &audio_id, CONF_TYPE_FLAG, 0, -1, -2, 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

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- mencoder.c	28 Sep 2002 18:03:19 -0000	1.169
+++ mencoder.c	28 Sep 2002 18:45:47 -0000	1.170
@@ -91,12 +91,9 @@
 char* dvdsub_lang=NULL;
 static char* spudec_ifo=NULL;
 
-static int has_audio=1;
-char *audio_codec=NULL; // override audio codec
-char *video_codec=NULL; // override video codec
-char **audio_codec_list=NULL; // override video codec
-char **video_codec_list=NULL; // override video codec
-char** audio_fm_list=NULL;     // override video codec family 
+char** audio_codec_list=NULL;  // override audio codec
+char** video_codec_list=NULL;  // override video codec
+char** audio_fm_list=NULL;     // override audio codec family 
 char** video_fm_list=NULL;     // override video codec family 
 
 int out_audio_codec=-1;
@@ -451,7 +448,7 @@
 
   if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0);
 
-  if(!has_audio || demuxer2) audio_id=-2; /* do NOT read audio packets... */
+  if(demuxer2) audio_id=-2; /* do NOT read audio packets... */
 
   //demuxer=demux_open(stream,file_format,video_id,audio_id,dvdsub_id);
   demuxer=demux_open(stream,file_format,audio_id,video_id,dvdsub_id);

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.579
retrieving revision 1.580
diff -u -r1.579 -r1.580
--- mplayer.c	28 Sep 2002 18:03:19 -0000	1.579
+++ mplayer.c	28 Sep 2002 18:45:47 -0000	1.580
@@ -174,13 +174,9 @@
 int abs_seek_pos=0;
 
 // codecs:
-int has_audio=1;
-int has_video=1;
-char *audio_codec=NULL; // override audio codec
-char *video_codec=NULL; // override video codec
-char **audio_codec_list=NULL; // override video codec
+char **audio_codec_list=NULL; // override audio codec
 char **video_codec_list=NULL; // override video codec
-char **audio_fm_list=NULL;    // override video codec family 
+char **audio_fm_list=NULL;    // override audio codec family 
 char **video_fm_list=NULL;    // override video codec family 
 
 // streaming:
@@ -1057,8 +1053,6 @@
 }
 
 //============ Open DEMUXERS --- DETECT file type =======================
-
-if(!has_audio) audio_id=-2; // do NOT read audio packets...
 
 current_module="demux_open";
 

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mplayer.h	28 Sep 2002 18:03:20 -0000	1.17
+++ mplayer.h	28 Sep 2002 18:45:47 -0000	1.18
@@ -14,7 +14,6 @@
 extern char ** video_fm_list;
 extern char * video_driver;
 extern char * audio_driver;
-extern int    has_audio;
 extern float  audio_delay;
 
 extern int osd_level;