Mercurial > mplayer.hg
comparison mplayer.c @ 9517:d65ddafbc404
clean up of -geometry code.
disabled -geometry for all but -vo xv (will be fixed later)
author | attila |
---|---|
date | Sun, 02 Mar 2003 21:09:15 +0000 |
parents | a4e50ab9ac14 |
children | 11a39e14a762 |
comparison
equal
deleted
inserted
replaced
9516:1a98dc5021ef | 9517:d65ddafbc404 |
---|---|
108 #define PT_UP_PREV -3 | 108 #define PT_UP_PREV -3 |
109 | 109 |
110 //**************************************************************************// | 110 //**************************************************************************// |
111 // Config | 111 // Config |
112 //**************************************************************************// | 112 //**************************************************************************// |
113 | |
114 #include "libvo/geometry.h" | |
115 | |
116 m_config_t* mconfig; | 113 m_config_t* mconfig; |
117 | 114 |
118 #ifdef NEW_CONFIG | 115 #ifdef NEW_CONFIG |
119 extern play_tree_t* | 116 extern play_tree_t* |
120 m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv); | 117 m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv); |
733 if(playtree == NULL) | 730 if(playtree == NULL) |
734 exit(1); | 731 exit(1); |
735 #else | 732 #else |
736 if(m_config_parse_command_line(mconfig, argc, argv) < 0) exit(1); // error parsing cmdline | 733 if(m_config_parse_command_line(mconfig, argc, argv) < 0) exit(1); // error parsing cmdline |
737 #endif | 734 #endif |
738 | |
739 geometryFull(&opt_screen_size_x, &opt_screen_size_y, NULL, NULL, | |
740 vo_screenwidth, vo_screenheight, vo_screenwidth, vo_screenheight); | |
741 | 735 |
742 playtree = play_tree_cleanup(playtree); | 736 playtree = play_tree_cleanup(playtree); |
743 if(playtree) { | 737 if(playtree) { |
744 playtree_iter = play_tree_iter_new(playtree,mconfig); | 738 playtree_iter = play_tree_iter_new(playtree,mconfig); |
745 if(playtree_iter) { | 739 if(playtree_iter) { |