Mercurial > mplayer.hg
changeset 31328:599bf04eceeb
Remove more gui-related code from libvo.
| author | reimar |
|---|---|
| date | Sun, 13 Jun 2010 22:38:15 +0000 |
| parents | 0bb0b99e4dc1 |
| children | 60709ef498be |
| files | gui/interface.c libvo/x11_common.c |
| diffstat | 2 files changed, 0 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Sun Jun 13 19:10:37 2010 +0000 +++ b/gui/interface.c Sun Jun 13 22:38:15 2010 +0000 @@ -232,8 +232,6 @@ mplMenuInit(); mplPBInit(); - vo_setwindow( appMPlayer.subWindow.WindowID, appMPlayer.subWindow.wGC ); - // i=wsHideFrame|wsMaxSize|wsHideWindow; // if ( appMPlayer.mainDecoration ) i=wsShowFrame|wsMaxSize|wsHideWindow; i=wsShowFrame|wsMaxSize|wsHideWindow;
--- a/libvo/x11_common.c Sun Jun 13 19:10:37 2010 +0000 +++ b/libvo/x11_common.c Sun Jun 13 22:38:15 2010 +0000 @@ -749,14 +749,6 @@ GC f_gc = NULL; XSizeHints vo_hint; -#ifdef CONFIG_GUI -void vo_setwindow(Window w, GC g) -{ - vo_window = w; - vo_gc = g; -} -#endif - void vo_x11_uninit(void) { saver_on(mDisplay); @@ -768,10 +760,6 @@ XFreeGC(mDisplay, f_gc); f_gc = NULL; } -#ifdef CONFIG_GUI - /* destroy window only if it's not controlled by the GUI */ - if (!use_gui) -#endif { if (vo_gc) { @@ -1658,11 +1646,7 @@ void vo_vm_close(void) { -#ifdef CONFIG_GUI - if (vidmodes != NULL && vo_window != None) -#else if (vidmodes != NULL) -#endif { int i, modecount;