[vlc-commits] vout: remove dead fullscreen code in display plugins
Rémi Denis-Courmont
git at videolan.org
Thu Oct 16 19:26:08 CEST 2014
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 12 23:50:58 2014 +0300| [d24ad5fcddbd53e37124ca68c2b8bb677a1656fc] | committer: Rémi Denis-Courmont
vout: remove dead fullscreen code in display plugins
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d24ad5fcddbd53e37124ca68c2b8bb677a1656fc
---
modules/hw/vdpau/display.c | 5 -----
modules/video_output/gl.c | 7 -------
modules/video_output/kva.c | 10 +++-------
modules/video_output/macosx.m | 8 --------
modules/video_output/wayland/shm.c | 7 -------
modules/video_output/xcb/glx.c | 6 ------
modules/video_output/xcb/x11.c | 6 ------
modules/video_output/xcb/xvideo.c | 6 ------
8 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index ab44621..0f03ba5 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -362,11 +362,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
values);
break;
}
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *c = va_arg(ap, const vout_display_cfg_t *);
- return vout_window_SetFullScreen(sys->embed, c->is_fullscreen);
- }
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
{
const vout_display_cfg_t *cfg = va_arg(ap, const vout_display_cfg_t *);
diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 39ddae3..74c8752 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -243,13 +243,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
case VOUT_DISPLAY_RESET_PICTURES: // not needed
assert(0);
#endif
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *c =
- va_arg (ap, const vout_display_cfg_t *);
-
- return vout_window_SetFullScreen (sys->gl->surface, c->is_fullscreen);
- }
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
index d8b9cc1..5f888b1 100644
--- a/modules/video_output/kva.c
+++ b/modules/video_output/kva.c
@@ -447,14 +447,10 @@ static int Control( vout_display_t *vd, int query, va_list args )
case VOUT_DISPLAY_CHANGE_FULLSCREEN:
{
- vout_display_cfg_t cfg = *va_arg(args, const vout_display_cfg_t *);
-
- if( sys->parent_window )
- vout_window_SetFullScreen(sys->parent_window, cfg.is_fullscreen);
- else
- WinPostMsg( sys->client, WM_VLC_FULLSCREEN_CHANGE,
- MPFROMLONG( cfg.is_fullscreen ), 0 );
+ const vout_display_cfg_t *cfg = va_arg(args, const vout_display_cfg_t *);
+ WinPostMsg( sys->client, WM_VLC_FULLSCREEN_CHANGE,
+ MPFROMLONG( cfg->is_fullscreen ), 0 );
return VLC_SUCCESS;
}
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index a74f269..02cdbd7 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -322,14 +322,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
switch (query)
{
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *cfg = va_arg (ap, const vout_display_cfg_t *);
- if (vout_window_SetFullScreen (sys->embed, cfg->is_fullscreen))
- return VLC_EGENERIC;
-
- return VLC_SUCCESS;
- }
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index 42a0840..f20982b 100644
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -271,13 +271,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
break;
}
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *cfg =
- va_arg(ap, const vout_display_cfg_t *);
- return vout_window_SetFullScreen(sys->embed, cfg->is_fullscreen);
- }
-
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index 3165949..3287f4b 100644
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -215,12 +215,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
switch (query)
{
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *c = va_arg (ap, const vout_display_cfg_t *);
- return vout_window_SetFullScreen (sys->gl->surface, c->is_fullscreen);
- }
-
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 7086d00..58152b0 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -467,12 +467,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
switch (query)
{
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *c = va_arg (ap, const vout_display_cfg_t *);
- return vout_window_SetFullScreen (sys->embed, c->is_fullscreen);
- }
-
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
{
const vout_display_cfg_t *p_cfg =
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index f820e74..ef61d32 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -746,12 +746,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
switch (query)
{
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *c = va_arg (ap, const vout_display_cfg_t *);
- return vout_window_SetFullScreen (p_sys->embed, c->is_fullscreen);
- }
-
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
More information about the vlc-commits
mailing list