[vlc-commits] vout: do not handle window state change control...
Rémi Denis-Courmont
git at videolan.org
Tue Dec 20 00:16:19 CET 2016
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Dec 20 01:01:56 2016 +0200| [feda2bc1c49683608b1200a590d1b80fe0289239] | committer: Rémi Denis-Courmont
vout: do not handle window state change control...
...on unaffected platforms. This control is for backward compatibility
with Windows and OS/2 code legacy. It is never triggered on other
platforms (where window state is a window rather than display control).
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=feda2bc1c49683608b1200a590d1b80fe0289239
---
include/vlc_vout_display.h | 4 ++--
modules/codec/omxil/vout.c | 1 -
modules/hw/mmal/vout.c | 1 -
modules/video_output/caopengllayer.m | 5 -----
modules/video_output/sdl.c | 2 --
5 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 90f29d9..70c5640 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -151,11 +151,11 @@ enum {
/* Ask the module to acknowledge/refuse the fullscreen state change after
* being requested (externally or by VOUT_DISPLAY_EVENT_FULLSCREEN */
VOUT_DISPLAY_CHANGE_FULLSCREEN, /* bool fs */
-
+#if defined(_WIN32) || defined(__OS2__)
/* Ask the module to acknowledge/refuse the window management state change
* after being requested externally or by VOUT_DISPLAY_WINDOW_STATE */
VOUT_DISPLAY_CHANGE_WINDOW_STATE, /* unsigned state */
-
+#endif
/* Ask the module to acknowledge/refuse the display size change requested
* (externally or by VOUT_DISPLAY_EVENT_DISPLAY_SIZE) */
VOUT_DISPLAY_CHANGE_DISPLAY_SIZE, /* const vout_display_cfg_t *p_cfg */
diff --git a/modules/codec/omxil/vout.c b/modules/codec/omxil/vout.c
index 3868343..ffbe4f5 100644
--- a/modules/codec/omxil/vout.c
+++ b/modules/codec/omxil/vout.c
@@ -458,7 +458,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
return VLC_SUCCESS;
}
case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c
index 8c7bc1f..4043f73 100644
--- a/modules/hw/mmal/vout.c
+++ b/modules/hw/mmal/vout.c
@@ -615,7 +615,6 @@ static int vd_control(vout_display_t *vd, int query, va_list args)
switch (query) {
case VOUT_DISPLAY_HIDE_MOUSE:
- case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
ret = VLC_SUCCESS;
break;
diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 34aa237..961fce4 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -421,11 +421,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return VLC_SUCCESS;
}
- case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
- {
- return VLC_SUCCESS;
- }
-
case VOUT_DISPLAY_CHANGE_VIEWPOINT:
{
int ret;
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index 7c588e5..1fe55d6 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -556,10 +556,8 @@ static int Control(vout_display_t *vd, int query, va_list args)
}
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
- case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
/* I don't think it is possible to support with SDL:
* - crop
- * - on top
*/
return VLC_EGENERIC;
More information about the vlc-commits
mailing list