Mercurial > mplayer.hg

comparison mplayer.c @ 17109:327be31a101d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix EDL to be per file, allow -edlout and -edl together as there is really no reason not to.
author ods15
date Tue, 06 Dec 2005 08:52:18 +0000
parents 05af35012e4f
children 637a2f4ff216
comparison
equal deleted inserted replaced
17108:f9a03e3c8e23 17109:327be31a101d
1524 } 1524 }
1525 1525
1526 if(opt_exit) 1526 if(opt_exit)
1527 exit_player(NULL); 1527 exit_player(NULL);
1528 1528
1529 #ifdef USE_EDL
1530 if (edl_check_mode() == EDL_ERROR && edl_filename)
1531 {
1532 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantUseBothModes);
1533 exit_player(NULL);
1534 } else if (edl_filename)
1535 {
1536 if (edl_records) free_edl(edl_records);
1537 next_edl_record = edl_records = edl_parse_file();
1538 } else if (edl_output_filename)
1539 {
1540 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL)
1541 {
1542 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
1543 edl_output_filename);
1544 exit_player(NULL);
1545 }
1546 }
1547 #endif
1548
1549 if (player_idle_mode && use_gui) { 1529 if (player_idle_mode && use_gui) {
1550 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui); 1530 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoIdleAndGui);
1551 exit_player_with_rc(NULL, 1); 1531 exit_player_with_rc(NULL, 1);
1552 } 1532 }
1553 1533
1825 } 1805 }
1826 } 1806 }
1827 //--------------------------------------------------------------------------- 1807 //---------------------------------------------------------------------------
1828 1808
1829 if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename); 1809 if(filename) mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_Playing, filename);
1810
1811 #ifdef USE_EDL
1812 if (edl_filename) {
1813 if (edl_records) free_edl(edl_records);
1814 next_edl_record = edl_records = edl_parse_file();
1815 }
1816 if (edl_output_filename) {
1817 if (edl_fd) fclose(edl_fd);
1818 if ((edl_fd = fopen(edl_output_filename, "w")) == NULL)
1819 {
1820 mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_EdlCantOpenForWrite,
1821 edl_output_filename);
1822 }
1823 }
1824 #endif
1830 1825
1831 //==================== Open VOB-Sub ============================ 1826 //==================== Open VOB-Sub ============================
1832 1827
1833 current_module="vobsub"; 1828 current_module="vobsub";
1834 if (vobsub_name){ 1829 if (vobsub_name){