[Mplayer-cvslog] CVS: main mplayer.c,1.296,1.297

[Arpi of Ize]

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

Modified Files:
	mplayer.c 
Log Message:
uninit stream

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- mplayer.c	20 Oct 2001 20:03:02 -0000	1.296
+++ mplayer.c	20 Oct 2001 23:48:56 -0000	1.297
@@ -267,6 +267,8 @@
 extern char *vo_subdevice;
 extern char *ao_subdevice;
 
+static stream_t* stream=NULL;
+
 static char* current_module=NULL; // for debugging
 
 static unsigned int inited_flags=0;
@@ -276,6 +278,7 @@
 #define INITED_GETCH2 8
 #define INITED_LIRC 16
 #define INITED_ENCODE 32
+#define INITED_STREAM 64
 #define INITED_ALL 0xFFFF
 
 void uninit_player(unsigned int mask){
@@ -317,6 +320,13 @@
     avi_fixate();
   }
 
+  if(mask&INITED_STREAM){
+    inited_flags&=~INITED_STREAM;
+    current_module="uninit_stream";
+    if(stream) free_stream(stream);
+    stream=NULL;
+  }
+
 #ifdef HAVE_LIRC
   if(mask&INITED_LIRC){
     inited_flags&=~INITED_LIRC;
@@ -442,7 +452,6 @@
 int curr_filename=0;
 
 char* filename=NULL; //"MI2-Trailer.avi";
-stream_t* stream=NULL;
 int file_format=DEMUXER_TYPE_UNKNOWN;
 //
 int delay_corrected=1;
@@ -745,7 +754,10 @@
   current_module="open_stream";
   stream=open_stream(filename,vcd_track,&file_format);
   if(!stream) goto goto_next_file;//  exit_player(MSGTR_Exit_error); // error...
+  inited_flags|=INITED_STREAM;
   stream->start_pos+=seek_to_byte;
+
+  stream_enable_cache(stream,2048*1024);
 
   use_stdin=filename && (!strcmp(filename,"-"));