Commit 03a5ec2b authored by Laurent Aimar's avatar Laurent Aimar

Updated vou display module after vout_display_SendEventDisplaySize change.

parent 904ef782
...@@ -126,7 +126,7 @@ static int Open(vlc_object_t *object) ...@@ -126,7 +126,7 @@ static int Open(vlc_object_t *object)
sys->state = *vd->cfg; sys->state = *vd->cfg;
sys->state.is_fullscreen = false; sys->state.is_fullscreen = false;
vout_display_SendEventFullscreen(vd, false); vout_display_SendEventFullscreen(vd, false);
vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height); vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -284,7 +284,7 @@ static void Manage(vout_display_t *vd) ...@@ -284,7 +284,7 @@ static void Manage(vout_display_t *vd)
aa_resize(sys->aa_context); aa_resize(sys->aa_context);
vout_display_SendEventDisplaySize(vd, vout_display_SendEventDisplaySize(vd,
aa_imgwidth(sys->aa_context), aa_imgwidth(sys->aa_context),
aa_imgheight(sys->aa_context)); aa_imgheight(sys->aa_context), false);
break; break;
/* TODO keys support to complete */ /* TODO keys support to complete */
......
...@@ -341,7 +341,7 @@ static void Refresh(vout_display_t *vd) ...@@ -341,7 +341,7 @@ static void Refresh(vout_display_t *vd)
if (width != vd->cfg->display.width || if (width != vd->cfg->display.width ||
height != vd->cfg->display.height) height != vd->cfg->display.height)
vout_display_SendEventDisplaySize(vd, width, height); vout_display_SendEventDisplaySize(vd, width, height, false);
} }
/** /**
...@@ -486,7 +486,7 @@ static void Manage(vout_display_t *vd) ...@@ -486,7 +486,7 @@ static void Manage(vout_display_t *vd)
} }
case CACA_EVENT_RESIZE: case CACA_EVENT_RESIZE:
vout_display_SendEventDisplaySize(vd, caca_get_event_resize_width(&ev), vout_display_SendEventDisplaySize(vd, caca_get_event_resize_width(&ev),
caca_get_event_resize_height(&ev)); caca_get_event_resize_height(&ev), false);
break; break;
case CACA_EVENT_MOUSE_MOTION: { case CACA_EVENT_MOUSE_MOTION: {
vout_display_place_t place; vout_display_place_t place;
......
...@@ -165,7 +165,7 @@ static int Open(vlc_object_t *object) ...@@ -165,7 +165,7 @@ static int Open(vlc_object_t *object)
/* */ /* */
vout_display_SendEventFullscreen(vd, true); vout_display_SendEventFullscreen(vd, true);
vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height); vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, true);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -269,7 +269,7 @@ static int Open(vlc_object_t *object) ...@@ -269,7 +269,7 @@ static int Open(vlc_object_t *object)
/* */ /* */
vout_display_SendEventFullscreen(vd, true); vout_display_SendEventFullscreen(vd, true);
vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height); vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, true);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -344,7 +344,7 @@ static int Open(vlc_object_t *object) ...@@ -344,7 +344,7 @@ static int Open(vlc_object_t *object)
vd->manage = Manage; vd->manage = Manage;
/* */ /* */
vout_display_SendEventDisplaySize(vd, display_width, display_height); vout_display_SendEventDisplaySize(vd, display_width, display_height, vd->cfg->is_fullscreen);
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
...@@ -512,7 +512,7 @@ static int Control(vout_display_t *vd, int query, va_list args) ...@@ -512,7 +512,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
vout_display_PlacePicture(&sys->place, &vd->source, &cfg, !sys->overlay); vout_display_PlacePicture(&sys->place, &vd->source, &cfg, !sys->overlay);
} }
vout_display_SendEventDisplaySize(vd, cfg.display.width, cfg.display.height); vout_display_SendEventDisplaySize(vd, cfg.display.width, cfg.display.height, cfg.is_fullscreen);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
case VOUT_DISPLAY_CHANGE_ZOOM: case VOUT_DISPLAY_CHANGE_ZOOM:
...@@ -652,7 +652,7 @@ static void Manage(vout_display_t *vd) ...@@ -652,7 +652,7 @@ static void Manage(vout_display_t *vd)
} }
case SDL_VIDEORESIZE: case SDL_VIDEORESIZE:
vout_display_SendEventDisplaySize(vd, event.resize.w, event.resize.h); vout_display_SendEventDisplaySize(vd, event.resize.w, event.resize.h, vd->cfg->is_fullscreen);
break; break;
default: default:
......
...@@ -236,7 +236,7 @@ static int Open(vlc_object_t *object) ...@@ -236,7 +236,7 @@ static int Open(vlc_object_t *object)
/* */ /* */
vout_display_SendEventFullscreen(vd, false); vout_display_SendEventFullscreen(vd, false);
vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height); vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
......
...@@ -79,7 +79,7 @@ HandleParentStructure (vout_display_t *vd, xcb_configure_notify_event_t *ev) ...@@ -79,7 +79,7 @@ HandleParentStructure (vout_display_t *vd, xcb_configure_notify_event_t *ev)
{ {
if (ev->width != vd->cfg->display.width || if (ev->width != vd->cfg->display.width ||
ev->height != vd->cfg->display.height) ev->height != vd->cfg->display.height)
vout_display_SendEventDisplaySize (vd, ev->width, ev->height); vout_display_SendEventDisplaySize (vd, ev->width, ev->height, vd->cfg->is_fullscreen);
} }
/** /**
......
...@@ -292,8 +292,8 @@ static int Open (vlc_object_t *obj) ...@@ -292,8 +292,8 @@ static int Open (vlc_object_t *obj)
vd->manage = Manage; vd->manage = Manage;
/* */ /* */
vout_display_SendEventDisplaySize (vd, width, height);
vout_display_SendEventFullscreen (vd, false); vout_display_SendEventFullscreen (vd, false);
vout_display_SendEventDisplaySize (vd, width, height, false);
return VLC_SUCCESS; return VLC_SUCCESS;
......
...@@ -492,10 +492,10 @@ static int Open (vlc_object_t *obj) ...@@ -492,10 +492,10 @@ static int Open (vlc_object_t *obj)
vd->manage = Manage; vd->manage = Manage;
/* */ /* */
vout_display_SendEventFullscreen (vd, false);
unsigned width, height; unsigned width, height;
if (!GetWindowSize (p_sys->embed, conn, &width, &height)) if (!GetWindowSize (p_sys->embed, conn, &width, &height))
vout_display_SendEventDisplaySize (vd, width, height); vout_display_SendEventDisplaySize (vd, width, height, false);
vout_display_SendEventFullscreen (vd, false);
return VLC_SUCCESS; return VLC_SUCCESS;
......
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