Skip to content

V
vlc-2-2
Commit d00aca23 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Updated xcb to use new VOUT_DISPLAY_CHANGE_DISPLAY_SIZE parameter.

parent 2663f4bf
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
modules/video_output/xcb/x11.c
View file @ d00aca23
...@@ -451,8 +451,10 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -451,8 +451,10 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{ {
const vout_display_cfg_t *p_cfg = const vout_display_cfg_t *p_cfg =
(const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *); (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *);
const bool is_forced = (bool)va_arg (ap, int);
if (vout_window_SetSize (p_sys->embed, if (is_forced
&& vout_window_SetSize (p_sys->embed,
p_cfg->display.width, p_cfg->display.width,
p_cfg->display.height)) p_cfg->display.height))
return VLC_EGENERIC; return VLC_EGENERIC;
......
modules/video_output/xcb/xvideo.c
View file @ d00aca23
...@@ -670,6 +670,7 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -670,6 +670,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{ {
const vout_display_cfg_t *cfg; const vout_display_cfg_t *cfg;
const video_format_t *source; const video_format_t *source;
bool is_forced;
if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT
|| query == VOUT_DISPLAY_CHANGE_SOURCE_CROP) || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP)
...@@ -681,10 +682,13 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -681,10 +682,13 @@ static int Control (vout_display_t *vd, int query, va_list ap)
{ {
source = &vd->source; source = &vd->source;
cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *); cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *);
if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
is_forced = (bool)va_arg (ap, int);
} }
/* */ /* */
if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE
&& is_forced
&& (cfg->display.width != vd->cfg->display.width && (cfg->display.width != vd->cfg->display.width
||cfg->display.height != vd->cfg->display.height) ||cfg->display.height != vd->cfg->display.height)
&& vout_window_SetSize (p_sys->embed, && vout_window_SetSize (p_sys->embed,
......
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