[Mplayer-cvslog] CVS: main mplayer.c,1.417,1.418
Alban Bedel CVS
albeu at mplayer.dev.hu
Thu Feb 28 14:49:06 CET 2002
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv18016
Modified Files:
mplayer.c
Log Message:
Fix when stdin is used as a file
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -r1.417 -r1.418
--- mplayer.c 25 Feb 2002 13:14:26 -0000 1.417
+++ mplayer.c 28 Feb 2002 13:49:03 -0000 1.418
@@ -163,7 +163,7 @@
// Common FIFO functions, and keyboard/event FIFO code
#include "fifo.c"
-
+int use_stdin=0;
//**************************************************************************//
#ifdef USE_LIBVO2
@@ -274,8 +274,6 @@
static int screen_size_xy=0;
static float movie_aspect=-1.0;
-char* playlist_file;
-
// sub:
char *font_name=NULL;
float font_factor=0.75;
@@ -512,7 +510,6 @@
//float a_frame=0; // Audio
int i;
-int use_stdin=0; //int f; // filedes
int gui_no_filename=0;
@@ -734,7 +731,7 @@
mp_input_add_key_fd(keyb_fifo_get,1,NULL,NULL);
if(slave_mode)
mp_input_add_cmd_fd(0,1,NULL,NULL);
-else
+else if(!use_stdin)
mp_input_add_key_fd(0,1,NULL,NULL);
inited_flags|=INITED_INPUT;
current_module = NULL;
@@ -935,19 +932,6 @@
}
}
}
-
-#ifdef HAVE_NEW_INPUT
- if(!slave_mode && filename && !use_stdin && !strcmp(filename,"-")) {
- mp_input_rm_key_fd(0);
- use_stdin = 1;
- }
- else if(!slave_mode && use_stdin && (!filename || strcmp(filename,"-"))) {
- mp_input_add_key_fd(0,1,NULL,NULL);
- use_stdin = 0;
- }
-#else
- use_stdin=filename && (!strcmp(filename,"-"));
-#endif
current_module="open_stream";
stream=open_stream(filename,vcd_track,&file_format);
More information about the MPlayer-cvslog
mailing list