Mercurial > mplayer.hg
comparison mplayer.c @ 18945:337d4324c766
No point in checking for X for windows gui, in addition the hackish
way via vo_init breaks vo_gl and vo_gl2 WinID support
author | reimar |
---|---|
date | Sat, 08 Jul 2006 13:59:17 +0000 |
parents | cde5b56f1610 |
children | 6ffd0c1f708e |
comparison
equal
deleted
inserted
replaced
18944:7040a3bc84c9 | 18945:337d4324c766 |
---|---|
2692 if(use_gui){ | 2692 if(use_gui){ |
2693 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui); | 2693 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_NoGui); |
2694 use_gui=0; | 2694 use_gui=0; |
2695 } | 2695 } |
2696 #else | 2696 #else |
2697 #ifndef WIN32 | |
2697 if(use_gui && !vo_init()){ | 2698 if(use_gui && !vo_init()){ |
2698 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_GuiNeedsX); | 2699 mp_msg(MSGT_CPLAYER,MSGL_WARN,MSGTR_GuiNeedsX); |
2699 use_gui=0; | 2700 use_gui=0; |
2700 } | 2701 } |
2702 #endif | |
2701 if (use_gui && playtree_iter){ | 2703 if (use_gui && playtree_iter){ |
2702 char cwd[PATH_MAX+2]; | 2704 char cwd[PATH_MAX+2]; |
2703 // Free Playtree and Playtree-Iter as it's not used by the GUI. | 2705 // Free Playtree and Playtree-Iter as it's not used by the GUI. |
2704 play_tree_iter_free(playtree_iter); | 2706 play_tree_iter_free(playtree_iter); |
2705 playtree_iter=NULL; | 2707 playtree_iter=NULL; |