[Mplayer-cvslog] CVS: main mencoder.c,1.210,1.211 mplayer.h,1.28,1.29

[Alban Bedel CVS]

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

Modified Files:
	mencoder.c mplayer.h 
Log Message:
Stream cleanup, don't use blah_on options anymore.


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- mencoder.c	29 Mar 2003 16:47:20 -0000	1.210
+++ mencoder.c	30 Mar 2003 17:07:30 -0000	1.211
@@ -92,7 +92,6 @@
 #define cache_fill_status 0
 #endif
 
-int vcd_track=0;
 int audio_id=-1;
 int video_id=-1;
 int dvdsub_id=-1;
@@ -422,7 +421,7 @@
   }
 #endif
 
-  if(!filename && !vcd_track && !dvd_title && !tv_param_on && !dvbin_param_on){
+  if(!filename){
 	printf(MSGTR_MissingFilename);
 	mencoder_exit(1,NULL);
   }
@@ -448,7 +447,7 @@
 
   vo_init_osd();
 
-  stream=open_stream(filename,vcd_track,&file_format);
+  stream=open_stream(filename,0,&file_format);
 
   if(!stream){
 	printf(MSGTR_CannotOpenFile_Device);
@@ -899,7 +898,7 @@
 	}
 	}
 
-if(tv_param_on == 1) 
+if(file_format == DEMUXER_TYPE_TV) 
 	{
 	fprintf(stderr,"Forcing audio preload to 0, max pts correction to 0\n");
 	audio_preload = 0.0;
@@ -1114,7 +1113,7 @@
 
 if(skip_flag<0){
     // duplicate frame
-	if(!tv_param_on && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag);
+	if(file_format != DEMUXER_TYPE_TV && !verbose) printf(MSGTR_DuplicateFrames,-skip_flag);
     while(skip_flag<0){
 	duplicatedframes++;
 	muxer_write_chunk(mux_v,0,0);
@@ -1123,7 +1122,7 @@
 } else
 if(skip_flag>0){
     // skip frame
-	if(!tv_param_on && !verbose) printf(MSGTR_SkipFrame);
+	if(file_format != DEMUXER_TYPE_TV && !verbose) printf(MSGTR_SkipFrame);
 	skippedframes++;
     --skip_flag;
 }

Index: mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mplayer.h	21 Jan 2003 19:12:34 -0000	1.28
+++ mplayer.h	30 Mar 2003 17:07:30 -0000	1.29
@@ -7,7 +7,6 @@
 
 extern int use_gui;
 extern char* current_module;
-extern int vcd_track;
 
 extern char * dvd_device;
 extern char * cdrom_device;