[vlc-commits] Enabled screensaver for win32 opengl vout (close #426).

Laurent Aimar git at videolan.org
Sun May 27 18:57:54 CEST 2012


vlc/vlc-2.0 | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May 26 14:54:14 2012 +0200| [93e5cfc7f056f85238f2971deaaba2d470844b3d] | committer: Jean-Baptiste Kempf

Enabled screensaver for win32 opengl vout (close #426).
(cherry picked from commit d20acdeca0078e548a68491cd27e7413d5e5a4b1)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=93e5cfc7f056f85238f2971deaaba2d470844b3d
---

 modules/video_output/msw/common.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
index d1d479a..b0d4c7f 100644
--- a/modules/video_output/msw/common.c
+++ b/modules/video_output/msw/common.c
@@ -66,7 +66,7 @@
 static void CommonChangeThumbnailClip(vout_display_t *, bool show);
 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 RestoreScreensaver(vout_display_t *);
 #endif
@@ -124,7 +124,7 @@ int CommonInit(vout_display_t *vd)
     }
 
     /* 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);
     DisableScreensaver (vd);
 #endif
@@ -143,7 +143,7 @@ void CommonClean(vout_display_t *vd)
         EventThreadDestroy(sys->event);
     }
 
-#if !defined(UNDER_CE) && !defined(MODULE_NAME_IS_glwin32)
+#if !defined(UNDER_CE)
     RestoreScreensaver(vd);
 #endif
 }
@@ -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)
 {
     vout_display_sys_t *sys = vd->sys;



More information about the vlc-commits mailing list