[vlc-devel] [PATCH] Win32: correctly use option "disable-screensaver"

[Jean-Baptiste Kempf]

This got applied :)

On 24 Jan, Felix Abecassis wrote :
> Close #10366.
> ---
>  modules/video_output/msw/common.c |    2 +-
>  modules/video_output/msw/events.c |   10 ++--------
>  2 files changed, 3 insertions(+), 9 deletions(-)
> 
> diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c
> index 3a0f626..1174a42 100644
> --- a/modules/video_output/msw/common.c
> +++ b/modules/video_output/msw/common.c
> @@ -63,6 +63,7 @@ int CommonInit(vout_display_t *vd)
>      sys->is_on_top = false;
>  
>      var_Create(vd, "video-deco", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
> +    var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
>  
>      /* */
>      sys->event = EventThreadCreate(vd);
> @@ -98,7 +99,6 @@ int CommonInit(vout_display_t *vd)
>              vout_display_SendEventFullscreen(vd, false);
>      }
>  
> -    var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
>      DisableScreensaver (vd);
>  
>      return VLC_SUCCESS;
> diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
> index c9dcaa2..90939dc 100644
> --- a/modules/video_output/msw/events.c
> +++ b/modules/video_output/msw/events.c
> @@ -157,7 +157,8 @@ static void *EventThread( void *p_this )
>      }
>  
>      /* Prevent monitor from powering off */
> -    SetThreadExecutionState( ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED | ES_CONTINUOUS );
> +    if (var_GetBool(vd, "disable-screensaver"))
> +	SetThreadExecutionState( ES_DISPLAY_REQUIRED | ES_SYSTEM_REQUIRED | ES_CONTINUOUS );
>  
>      /* Main loop */
>      /* GetMessage will sleep if there's no message in the queue */
> @@ -919,13 +920,6 @@ static long FAR PASCAL WinVoutEventProc( HWND hwnd, UINT message,
>      }
>      vout_display_t *vd = p_event->vd;
>  
> -    /* Catch the screensaver and the monitor turn-off */
> -    if( message == WM_SYSCOMMAND &&
> -        ( (wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER ) )
> -    {
> -        //if( vd ) msg_Dbg( vd, "WinProc WM_SYSCOMMAND screensaver" );
> -        return 0; /* this stops them from happening */
> -    }
>  #if 0
>      if( message == WM_SETCURSOR )
>      {
> -- 
> 1.7.10.4
> 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel

-- 
With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device