Commit 2b63be07 authored by Steve Lhomme's avatar Steve Lhomme

vout:win32: remove flag to allow display modules to use the full display size

It is always true now that all modules have been fixed to properly place the
textures.
parent 947b51b4
......@@ -79,8 +79,7 @@ static bool GetWindowDimensions(void *opaque, UINT *width, UINT *height)
/* */
int CommonInit(vlc_object_t *obj, display_win32_area_t *area,
vout_display_sys_win32_t *sys,
bool projection_gestures, bool full_size_video)
vout_display_sys_win32_t *sys, bool projection_gestures)
{
if (unlikely(area->vdcfg.window == NULL))
return VLC_EGENERIC;
......@@ -96,7 +95,6 @@ int CommonInit(vlc_object_t *obj, display_win32_area_t *area,
sys->hvideownd = NULL;
sys->hparent = NULL;
sys->is_first_placement = true;
sys->full_size_video = full_size_video;
/* */
sys->event = EventThreadCreate(obj, area->vdcfg.window);
......@@ -180,20 +178,15 @@ void UpdateRects(vout_display_t *vd, display_win32_area_t *area, vout_display_sy
{
if (sys->hvideownd)
{
UINT swpFlags = SWP_NOCOPYBITS | SWP_NOZORDER | SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE;
UINT swpFlags = SWP_NOCOPYBITS | SWP_NOZORDER | SWP_ASYNCWINDOWPOS | SWP_NOACTIVATE | SWP_NOMOVE;
if (sys->is_first_placement)
{
swpFlags |= SWP_SHOWWINDOW;
sys->is_first_placement = false;
}
if (sys->full_size_video)
SetWindowPos(sys->hvideownd, 0,
0, 0, display_width, display_height,
swpFlags);
else
SetWindowPos(sys->hvideownd, 0,
area->place.x, area->place.y, area->place.width, area->place.height,
swpFlags);
SetWindowPos(sys->hvideownd, 0,
0, 0, display_width, display_height,
swpFlags);
}
CommonChangeThumbnailClip(VLC_OBJECT(vd), sys, true);
......
......@@ -67,7 +67,6 @@ typedef struct vout_display_sys_win32_t
/* Misc */
bool is_first_placement;
bool full_size_video; /* true if hvideownd should have the same size as hwnd */
} vout_display_sys_win32_t;
......@@ -76,7 +75,7 @@ typedef struct vout_display_sys_win32_t
*****************************************************************************/
#if !VLC_WINSTORE_APP
int CommonInit(vlc_object_t *, display_win32_area_t *, vout_display_sys_win32_t *,
bool projection_gestures, bool full_size_video);
bool projection_gestures);
void CommonClean(vlc_object_t *, vout_display_sys_win32_t *);
#endif /* !VLC_WINSTORE_APP */
int CommonControl(vout_display_t *, display_win32_area_t *, vout_display_sys_win32_t *, int , va_list );
......
......@@ -476,7 +476,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
if (d3d11_ctx == NULL)
{
if (CommonInit(VLC_OBJECT(vd), &sys->area, &sys->sys,
vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR, true))
vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR))
goto error;
}
#else /* !VLC_WINSTORE_APP */
......
......@@ -1651,7 +1651,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
InitArea(vd, &sys->area, cfg);
if (d3d9_device == NULL)
{
if (CommonInit(VLC_OBJECT(vd), &sys->area, &sys->sys, false, true))
if (CommonInit(VLC_OBJECT(vd), &sys->area, &sys->sys, false))
goto error;
}
......
......@@ -124,7 +124,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
/* */
InitArea(vd, &sys->area, cfg);
if (CommonInit(VLC_OBJECT(vd), &sys->area, &sys->sys,
vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR, true))
vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR))
goto error;
if (vd->source.projection_mode != PROJECTION_MODE_RECTANGULAR)
......
......@@ -118,7 +118,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
return VLC_ENOMEM;
InitArea(vd, &sys->area, cfg);
if (CommonInit(VLC_OBJECT(vd), &sys->area, &sys->sys, false, true))
if (CommonInit(VLC_OBJECT(vd), &sys->area, &sys->sys, false))
goto error;
/* */
......
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