diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-20 09:34:27 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:46:34 +0300 |
| commit | 26039a38e3d5a2305e0ec93481df07c2717aa06d (patch) | |
| tree | e34ac09d222f260ddadbb00f088dc8029d6a7988 /mplayer.c | |
| parent | acf319b3edea4d8dd0fe338778e08e0d99dc49bb (diff) | |
| download | mpv-26039a38e3d5a2305e0ec93481df07c2717aa06d.tar.bz2 mpv-26039a38e3d5a2305e0ec93481df07c2717aa06d.tar.xz | |
Move global mDisplay to x11 state struct
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -151,7 +151,7 @@ static int cfg_include(m_option_t *conf, char *filename){ // XScreensaver //**************************************************************************// -void xscreensaver_heartbeat(void); +void xscreensaver_heartbeat(struct vo_x11_state *); //**************************************************************************// //**************************************************************************// @@ -689,7 +689,7 @@ void exit_player_with_rc(const char* how, int rc){ #ifdef HAVE_NEW_GUI if ( !use_gui ) #endif - vo_uninit(); // Close the X11 connection (if any is open). + vo_uninit(mpctx->x11_state); // Close the X11 connection (if any is open). #endif #ifdef HAVE_FREETYPE @@ -3752,7 +3752,7 @@ if(!mpctx->sh_video) { #ifdef HAVE_X11 if (stop_xscreensaver) { current_module = "stop_xscreensaver"; - xscreensaver_heartbeat(); + xscreensaver_heartbeat(mpctx->x11_state); } #endif if (heartbeat_cmd) { |