[MPlayer-cvslog] r22331 - in trunk: fifo.c help/help_mp-en.h mplayer.c

[uau]

Author: uau
Date: Sat Feb 24 08:28:07 2007
New Revision: 22331

Modified:
   trunk/fifo.c
   trunk/mplayer.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-en.h

Log:
Remove some #if 0 code


Modified: trunk/fifo.c
==============================================================================
--- trunk/fifo.c	(original)
+++ trunk/fifo.c	Sat Feb 24 08:28:07 2007
@@ -1,39 +1,5 @@
 #include "input/mouse.h"
 
-#if 0
-
-// keyboard:
-static int keyb_fifo_put=-1;
-static int keyb_fifo_get=-1;
-
-static void set_nonblock_flag(int fd) {
-  int oldflags;
-
-  oldflags = fcntl(fd, F_GETFL, 0);
-  if (oldflags != -1) {
-    if (fcntl(keyb_fifo_put, F_SETFL, oldflags | O_NONBLOCK) != -1) {
-       return;
-    }
-  }
-  mp_msg(MSGT_INPUT,MSGL_ERR,"Cannot set nonblocking mode for fd %d!\n", fd);
-}
-
-static void make_pipe(int* pr,int* pw){
-  int temp[2];
-  if(pipe(temp)!=0) mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_CannotMakePipe);
-  *pr=temp[0];
-  *pw=temp[1];
-  set_nonblock_flag(temp[1]);
-}
-
-static void mplayer_put_key_internal(int code){
-
-    if( write(keyb_fifo_put,&code,4) != 4 ){
-        mp_msg(MSGT_INPUT,MSGL_ERR,"*** key event dropped (FIFO is full) ***\n");
-    }
-}
-
-#else
 
 int key_fifo_size = 7;
 static int *key_fifo_data = NULL;
@@ -66,7 +32,6 @@
   return key;
 }
 
-#endif
 
 static unsigned doubleclick_time = 300;
 

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	(original)
+++ trunk/mplayer.c	Sat Feb 24 08:28:07 2007
@@ -2586,14 +2586,7 @@
 // Init input system
 current_module = "init_input";
 mp_input_init(use_gui);
-#if 0
-make_pipe(&keyb_fifo_get,&keyb_fifo_put);
-
-if(keyb_fifo_get > 0)
-  mp_input_add_key_fd(keyb_fifo_get,1,NULL,NULL);
-#else
   mp_input_add_key_fd(-1,0,mplayer_get_key,NULL);
-#endif
 if(slave_mode)
 #ifndef __MINGW32__
    mp_input_add_cmd_fd(0,1,NULL,NULL);
@@ -3008,30 +3001,7 @@
 }
 
 if(!mpctx->demuxer) 
-{
-#if 0
-  play_tree_t* entry;
-  // Handle playlist
-  current_module="handle_playlist";
-  switch(mpctx->stream->type){
-  case STREAMTYPE_VCD:
-  case STREAMTYPE_DVD:
-  case STREAMTYPE_CDDA:
-  case STREAMTYPE_VCDBINCUE:
-    // don't try to parse raw media as playlist, it's unlikely
-    goto goto_next_file;
-  }
-  mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FallingBackOnPlaylist,filename);
-  stream_reset(mpctx->stream);
-  stream_seek(mpctx->stream,mpctx->stream->start_pos);
-  entry = parse_playtree(mpctx->stream,0);
-  if(!entry)
-    mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
-  else
-    eof=playtree_add_playlist(entry);
-#endif
   goto goto_next_file;
-}
 inited_flags|=INITED_DEMUXER;
 
 if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_DVDNAV) {