Mercurial > mplayer.hg
comparison libvo/vo_xmga.c @ 27343:5fe6a8adf569
Rename two GUI-related preprocessor directives:
HAVE_NEW_GUI --> CONFIG_GUI, HAVE_GTK2_GUI --> CONFIG_GTK2
| author | diego |
|---|---|
| date | Wed, 30 Jul 2008 13:44:59 +0000 |
| parents | afa125da85cf |
| children | d58d06eafe83 |
comparison
equal
deleted
inserted
replaced
| 27342:3a174cb28d36 | 27343:5fe6a8adf569 |
|---|---|
| 41 #include "osdep/timer.h" | 41 #include "osdep/timer.h" |
| 42 static unsigned int timer = 0; | 42 static unsigned int timer = 0; |
| 43 static unsigned int timerd = 0; | 43 static unsigned int timerd = 0; |
| 44 #endif | 44 #endif |
| 45 | 45 |
| 46 #ifdef HAVE_NEW_GUI | 46 #ifdef CONFIG_GUI |
| 47 #include "gui/interface.h" | 47 #include "gui/interface.h" |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 static const vo_info_t info = { | 50 static const vo_info_t info = { |
| 51 "Matrox G200/G4x0/G550 overlay in X11 window (using /dev/mga_vid)", | 51 "Matrox G200/G4x0/G550 overlay in X11 window (using /dev/mga_vid)", |
| 169 } | 169 } |
| 170 mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey); | 170 mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey); |
| 171 | 171 |
| 172 initialized = 1; | 172 initialized = 1; |
| 173 | 173 |
| 174 #ifdef HAVE_NEW_GUI | 174 #ifdef CONFIG_GUI |
| 175 if (use_gui) | 175 if (use_gui) |
| 176 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window | 176 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window |
| 177 else | 177 else |
| 178 #endif | 178 #endif |
| 179 { | 179 { |