comparison mplayer.c @ 22313:5a5c7529e8a3

Remove some #if 0 code
author uau
date Sat, 24 Feb 2007 07:28:07 +0000
parents cca9ff25bed2
children 434cd072b0d3
comparison
equal deleted inserted replaced
22312:cca9ff25bed2 22313:5a5c7529e8a3
2584 // ========== Init keyboard FIFO (connection to libvo) ============ 2584 // ========== Init keyboard FIFO (connection to libvo) ============
2585 2585
2586 // Init input system 2586 // Init input system
2587 current_module = "init_input"; 2587 current_module = "init_input";
2588 mp_input_init(use_gui); 2588 mp_input_init(use_gui);
2589 #if 0
2590 make_pipe(&keyb_fifo_get,&keyb_fifo_put);
2591
2592 if(keyb_fifo_get > 0)
2593 mp_input_add_key_fd(keyb_fifo_get,1,NULL,NULL);
2594 #else
2595 mp_input_add_key_fd(-1,0,mplayer_get_key,NULL); 2589 mp_input_add_key_fd(-1,0,mplayer_get_key,NULL);
2596 #endif
2597 if(slave_mode) 2590 if(slave_mode)
2598 #ifndef __MINGW32__ 2591 #ifndef __MINGW32__
2599 mp_input_add_cmd_fd(0,1,NULL,NULL); 2592 mp_input_add_cmd_fd(0,1,NULL,NULL);
2600 #else 2593 #else
2601 mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL); 2594 mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL);
3006 goto goto_next_file; 2999 goto goto_next_file;
3007 } 3000 }
3008 } 3001 }
3009 3002
3010 if(!mpctx->demuxer) 3003 if(!mpctx->demuxer)
3011 {
3012 #if 0
3013 play_tree_t* entry;
3014 // Handle playlist
3015 current_module="handle_playlist";
3016 switch(mpctx->stream->type){
3017 case STREAMTYPE_VCD:
3018 case STREAMTYPE_DVD:
3019 case STREAMTYPE_CDDA:
3020 case STREAMTYPE_VCDBINCUE:
3021 // don't try to parse raw media as playlist, it's unlikely
3022 goto goto_next_file;
3023 }
3024 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_FallingBackOnPlaylist,filename);
3025 stream_reset(mpctx->stream);
3026 stream_seek(mpctx->stream,mpctx->stream->start_pos);
3027 entry = parse_playtree(mpctx->stream,0);
3028 if(!entry)
3029 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
3030 else
3031 eof=playtree_add_playlist(entry);
3032 #endif
3033 goto goto_next_file; 3004 goto goto_next_file;
3034 }
3035 inited_flags|=INITED_DEMUXER; 3005 inited_flags|=INITED_DEMUXER;
3036 3006
3037 if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_DVDNAV) { 3007 if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_DVDNAV) {
3038 int i; 3008 int i;
3039 // setup global sub numbering 3009 // setup global sub numbering