Mercurial > mplayer.hg
comparison mplayer.c @ 25467:7bdd28e3fca7
Remove useless #ifdefs
author | reimar |
---|---|
date | Sat, 22 Dec 2007 11:25:59 +0000 |
parents | 7ef04742572c |
children | a3f9b22287ca |
comparison
equal
deleted
inserted
replaced
25466:9ee347c404c9 | 25467:7bdd28e3fca7 |
---|---|
117 // Playtree | 117 // Playtree |
118 //**************************************************************************// | 118 //**************************************************************************// |
119 #include "playtree.h" | 119 #include "playtree.h" |
120 #include "playtreeparser.h" | 120 #include "playtreeparser.h" |
121 | 121 |
122 #ifdef HAVE_NEW_GUI | |
123 extern int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config); | 122 extern int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config); |
124 extern int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue); | 123 extern int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue); |
125 #endif | |
126 | 124 |
127 //**************************************************************************// | 125 //**************************************************************************// |
128 // Config | 126 // Config |
129 //**************************************************************************// | 127 //**************************************************************************// |
130 #include "parser-cfg.h" | 128 #include "parser-cfg.h" |
146 | 144 |
147 //**************************************************************************// | 145 //**************************************************************************// |
148 // XScreensaver | 146 // XScreensaver |
149 //**************************************************************************// | 147 //**************************************************************************// |
150 | 148 |
151 #ifdef HAVE_X11 | |
152 void xscreensaver_heartbeat(void); | 149 void xscreensaver_heartbeat(void); |
153 #endif | |
154 | 150 |
155 //**************************************************************************// | 151 //**************************************************************************// |
156 //**************************************************************************// | 152 //**************************************************************************// |
157 // Input media streaming & demultiplexer: | 153 // Input media streaming & demultiplexer: |
158 //**************************************************************************// | 154 //**************************************************************************// |