mirror of https://github.com/mpv-player/mpv
Missed some gui ifdefs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8043 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
29d5f337c9
commit
44ccf8ee81
|
@ -735,9 +735,13 @@ static void uninit(void)
|
||||||
overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
|
overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
|
||||||
overlay_release(overlay_data);
|
overlay_release(overlay_data);
|
||||||
|
|
||||||
|
#ifdef HAVE_NEW_GUI
|
||||||
if (!use_gui) {
|
if (!use_gui) {
|
||||||
|
#endif
|
||||||
vo_x11_uninit();
|
vo_x11_uninit();
|
||||||
|
#ifdef HAVE_NEW_GUI
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if (fd_video) {
|
if (fd_video) {
|
||||||
|
@ -896,12 +900,16 @@ static uint32_t preinit(const char *arg)
|
||||||
|
|
||||||
/* Initialize overlay and X11 */
|
/* Initialize overlay and X11 */
|
||||||
overlay_data = overlay_init(fd_control);
|
overlay_data = overlay_init(fd_control);
|
||||||
|
#ifdef HAVE_NEW_GUI
|
||||||
if (!use_gui) {
|
if (!use_gui) {
|
||||||
|
#endif
|
||||||
if (!vo_init()) {
|
if (!vo_init()) {
|
||||||
printf("VO: [dxr3] Unable to init x11!\n");
|
printf("VO: [dxr3] Unable to init x11!\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
#ifdef HAVE_NEW_GUI
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue