diff options
author | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-06 08:52:18 +0000 |
---|---|---|
committer | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-12-06 08:52:18 +0000 |
commit | 0fe5fb1e00cbb9ecbb198fb52da49c5757f4f576 (patch) | |
tree | 8db1df4c76df3413eaca4593b7118b5352131168 /mplayer.c | |
parent | f95066fb03378aed9b74f471a57cb6e09ba37064 (diff) | |
download | mpv-0fe5fb1e00cbb9ecbb198fb52da49c5757f4f576.tar.bz2 mpv-0fe5fb1e00cbb9ecbb198fb52da49c5757f4f576.tar.xz |
Fix EDL to be per file, allow -edlout and -edl together as there is really
no reason not to.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17110 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 35 |
1 files changed, 15 insertions, 20 deletions
@@ -1526,26 +1526,6 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ if(opt_exit) exit_player(NULL); -#ifdef USE_EDL -if (edl_check_mode() == EDL_ERROR && edl_filename) -{ - mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantUseBothModes); - exit_player(NULL); -} else if (edl_filename) -{ - if (edl_records) free_edl(edl_records); - next_edl_record = edl_records = edl_parse_file(); -} else if (edl_output_filename) -{ - if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) - { - mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite, - edl_output_filename); - exit_player(NULL); - } -} -#endif - if (player_idle_mode && use_gui) { mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui); exit_player_with_rc(NULL, 1); @@ -1828,6 +1808,21 @@ while (player_idle_mode && !filename) { if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename); +#ifdef USE_EDL +if (edl_filename) { + if (edl_records) free_edl(edl_records); + next_edl_record = edl_records = edl_parse_file(); +} +if (edl_output_filename) { + if (edl_fd) fclose(edl_fd); + if ((edl_fd = fopen(edl_output_filename, "w")) == NULL) + { + mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite, + edl_output_filename); + } +} +#endif + //==================== Open VOB-Sub ============================ current_module="vobsub"; |