summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authoruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-24 07:28:07 +0000
committeruau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-24 07:28:07 +0000
commit46c3f0385385971eecfa8413ba3005271ab1ab49 (patch)
tree3529d0e8ee934ce07d239c3a48c8b66c9c294cd3 /mplayer.c
parente5ab09bb64448e8d60f081891fb85d742c83c9a0 (diff)
downloadmpv-46c3f0385385971eecfa8413ba3005271ab1ab49.tar.bz2
mpv-46c3f0385385971eecfa8413ba3005271ab1ab49.tar.xz
Remove some #if 0 code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22331 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/mplayer.c b/mplayer.c
index 922b36c986..c17d551afa 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2586,14 +2586,7 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
// 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 && mpctx->demuxer->type==DEMUXER_TYPE_PLAYLIST)
}
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) {