vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Tue Aug 25 06:25:42 2020 +0200| [3090679c4643ca0dfff5646ac1ad8207b99dd431] | committer: Steve Lhomme
vout: win32: remove unused "disable-screensaver" local variable copy > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3090679c4643ca0dfff5646ac1ad8207b99dd431 --- modules/video_output/win32/common.c | 4 +--- modules/video_output/win32/common.h | 2 +- modules/video_output/win32/direct3d11.c | 2 +- modules/video_output/win32/direct3d9.c | 2 +- modules/video_output/win32/glwin32.c | 2 +- modules/video_output/win32/wingdi.c | 2 +- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/video_output/win32/common.c b/modules/video_output/win32/common.c index a09e40b569..f9b9674dad 100644 --- a/modules/video_output/win32/common.c +++ b/modules/video_output/win32/common.c @@ -41,12 +41,10 @@ #include "common.h" #include "../../video_chroma/copy.h" -void CommonInit(vout_display_t *vd, display_win32_area_t *area, const vout_display_cfg_t *vdcfg) +void CommonInit(display_win32_area_t *area, const vout_display_cfg_t *vdcfg) { area->place_changed = false; area->vdcfg = *vdcfg; - - var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); } #if !VLC_WINSTORE_APP diff --git a/modules/video_output/win32/common.h b/modules/video_output/win32/common.h index abca868bdd..18298b5e47 100644 --- a/modules/video_output/win32/common.h +++ b/modules/video_output/win32/common.h @@ -75,7 +75,7 @@ int CommonControl(vout_display_t *, display_win32_area_t *, vout_display_sys_wi void CommonPlacePicture (vout_display_t *, display_win32_area_t *, vout_display_sys_win32_t *); -void CommonInit(vout_display_t *, display_win32_area_t *, const vout_display_cfg_t *); +void CommonInit(display_win32_area_t *, const vout_display_cfg_t *); # ifdef __cplusplus extern "C" { diff --git a/modules/video_output/win32/direct3d11.c b/modules/video_output/win32/direct3d11.c index 299d1140b3..b668fdbd06 100644 --- a/modules/video_output/win32/direct3d11.c +++ b/modules/video_output/win32/direct3d11.c @@ -296,7 +296,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, if (ret != VLC_SUCCESS) goto error; - CommonInit(vd, &sys->area, cfg); + CommonInit(&sys->area, cfg); sys->outside_opaque = var_InheritAddress( vd, "vout-cb-opaque" ); sys->updateOutputCb = var_InheritAddress( vd, "vout-cb-update-output" ); diff --git a/modules/video_output/win32/direct3d9.c b/modules/video_output/win32/direct3d9.c index 9879be459d..41b787d150 100644 --- a/modules/video_output/win32/direct3d9.c +++ b/modules/video_output/win32/direct3d9.c @@ -1805,7 +1805,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, if (!sys) return VLC_ENOMEM; - CommonInit(vd, &sys->area, cfg); + CommonInit(&sys->area, cfg); sys->outside_opaque = var_InheritAddress( vd, "vout-cb-opaque" ); sys->updateOutputCb = var_InheritAddress( vd, "vout-cb-update-output" ); diff --git a/modules/video_output/win32/glwin32.c b/modules/video_output/win32/glwin32.c index e8147ed996..fb4e44768c 100644 --- a/modules/video_output/win32/glwin32.c +++ b/modules/video_output/win32/glwin32.c @@ -120,7 +120,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, return VLC_ENOMEM; /* */ - CommonInit(vd, &sys->area, cfg); + CommonInit(&sys->area, cfg); if (CommonWindowInit(vd, &sys->area, &sys->sys, vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR)) goto error; diff --git a/modules/video_output/win32/wingdi.c b/modules/video_output/win32/wingdi.c index 7cfb2cdb51..79b94fabe3 100644 --- a/modules/video_output/win32/wingdi.c +++ b/modules/video_output/win32/wingdi.c @@ -116,7 +116,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg, if (!sys) return VLC_ENOMEM; - CommonInit(vd, &sys->area, cfg); + CommonInit(&sys->area, cfg); if (CommonWindowInit(vd, &sys->area, &sys->sys, false)) goto error; _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits