Commit 93e5cfc7 authored by Laurent Aimar's avatar Laurent Aimar Committed by Jean-Baptiste Kempf

Enabled screensaver for win32 opengl vout (close #426).

(cherry picked from commit d20acdeca0078e548a68491cd27e7413d5e5a4b1)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 93695a95
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
static void CommonChangeThumbnailClip(vout_display_t *, bool show); static void CommonChangeThumbnailClip(vout_display_t *, bool show);
static int CommonControlSetFullscreen(vout_display_t *, bool is_fullscreen); static int CommonControlSetFullscreen(vout_display_t *, bool is_fullscreen);
#if !defined(UNDER_CE) && !defined(MODULE_NAME_IS_glwin32) #if !defined(UNDER_CE)
static void DisableScreensaver(vout_display_t *); static void DisableScreensaver(vout_display_t *);
static void RestoreScreensaver(vout_display_t *); static void RestoreScreensaver(vout_display_t *);
#endif #endif
...@@ -124,7 +124,7 @@ int CommonInit(vout_display_t *vd) ...@@ -124,7 +124,7 @@ int CommonInit(vout_display_t *vd)
} }
/* Why not with glwin32 */ /* Why not with glwin32 */
#if !defined(UNDER_CE) && !defined(MODULE_NAME_IS_glwin32) #if !defined(UNDER_CE)
var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
DisableScreensaver (vd); DisableScreensaver (vd);
#endif #endif
...@@ -143,7 +143,7 @@ void CommonClean(vout_display_t *vd) ...@@ -143,7 +143,7 @@ void CommonClean(vout_display_t *vd)
EventThreadDestroy(sys->event); EventThreadDestroy(sys->event);
} }
#if !defined(UNDER_CE) && !defined(MODULE_NAME_IS_glwin32) #if !defined(UNDER_CE)
RestoreScreensaver(vd); RestoreScreensaver(vd);
#endif #endif
} }
...@@ -688,7 +688,7 @@ int CommonControl(vout_display_t *vd, int query, va_list args) ...@@ -688,7 +688,7 @@ int CommonControl(vout_display_t *vd, int query, va_list args)
} }
} }
#if !defined(UNDER_CE) && !defined(MODULE_NAME_IS_glwin32) #if !defined(UNDER_CE)
static void DisableScreensaver(vout_display_t *vd) static void DisableScreensaver(vout_display_t *vd)
{ {
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment