Mercurial > mplayer.hg
comparison mplayer.c @ 25433:55e3b1a32c65
Make libmenu init and uninit in proper place.
| author | ulion |
|---|---|
| date | Wed, 19 Dec 2007 08:42:18 +0000 |
| parents | a79a22add62a |
| children | 333ba4e7d5e3 |
comparison
equal
deleted
inserted
replaced
| 25432:7957b8762195 | 25433:55e3b1a32c65 |
|---|---|
| 666 | 666 |
| 667 if(mask&INITED_INPUT){ | 667 if(mask&INITED_INPUT){ |
| 668 inited_flags&=~INITED_INPUT; | 668 inited_flags&=~INITED_INPUT; |
| 669 current_module="uninit_input"; | 669 current_module="uninit_input"; |
| 670 mp_input_uninit(); | 670 mp_input_uninit(); |
| 671 #ifdef HAVE_MENU | |
| 672 if (use_menu) | |
| 673 menu_uninit(); | |
| 674 #endif | |
| 671 } | 675 } |
| 672 | 676 |
| 673 current_module=NULL; | 677 current_module=NULL; |
| 674 } | 678 } |
| 675 | 679 |
| 2614 mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL); | 2618 mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL); |
| 2615 #endif | 2619 #endif |
| 2616 else if(!noconsolecontrols) | 2620 else if(!noconsolecontrols) |
| 2617 mp_input_add_event_fd(0, getch2); | 2621 mp_input_add_event_fd(0, getch2); |
| 2618 | 2622 |
| 2619 inited_flags|=INITED_INPUT; | |
| 2620 current_module = NULL; | |
| 2621 | |
| 2622 #ifdef HAVE_MENU | 2623 #ifdef HAVE_MENU |
| 2623 if(use_menu) { | 2624 if(use_menu) { |
| 2624 if(menu_cfg && menu_init(mpctx, menu_cfg)) | 2625 if(menu_cfg && menu_init(mpctx, menu_cfg)) |
| 2625 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); | 2626 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_MenuInitialized, menu_cfg); |
| 2626 else { | 2627 else { |
| 2637 } | 2638 } |
| 2638 } | 2639 } |
| 2639 } | 2640 } |
| 2640 #endif | 2641 #endif |
| 2641 | 2642 |
| 2643 inited_flags|=INITED_INPUT; | |
| 2644 current_module = NULL; | |
| 2645 | |
| 2642 /// Catch signals | 2646 /// Catch signals |
| 2643 #ifndef __MINGW32__ | 2647 #ifndef __MINGW32__ |
| 2644 signal(SIGCHLD,child_sighandler); | 2648 signal(SIGCHLD,child_sighandler); |
| 2645 #endif | 2649 #endif |
| 2646 | 2650 |