[vlc-devel] [PATCH] display: remove dead and deprecated OS2 code

[Steve Lhomme]

---
 include/vlc_vout_display.h |  8 --------
 src/video_output/display.c | 10 ----------
 2 files changed, 18 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index df9e81eb6dd..9b9dc6be788 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -146,14 +146,6 @@ typedef struct {
  * Control query for vout_display_t
  */
 enum vout_display_query {
-#if defined(__OS2__)
-    /* Ask the module to acknowledge/refuse the fullscreen state change after
-     * being requested (externally or by VOUT_DISPLAY_EVENT_FULLSCREEN */
-    VOUT_DISPLAY_CHANGE_FULLSCREEN VLC_DEPRECATED_ENUM,
-    /* 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 VLC_DEPRECATED_ENUM,
-#endif
     /**
      * Notifies a change in display size.
      *
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 9ada4bedd44..b66fe39c553 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -723,16 +723,6 @@ vout_display_t *vout_display_New(vlc_object_t *parent,
                         vout_display_start, osys) == NULL)
         goto error;
 
-#if defined(__OS2__)
-    if ((var_GetBool(parent, "fullscreen")
-      || var_GetBool(parent, "video-wallpaper"))
-     && vout_display_Control(vd, VOUT_DISPLAY_CHANGE_FULLSCREEN) == VLC_SUCCESS)
-        osys->cfg.is_fullscreen = true;
-
-    if (var_InheritBool(parent, "video-on-top"))
-        vout_display_Control(vd, VOUT_DISPLAY_CHANGE_WINDOW_STATE);
-#endif
-
     if (VoutDisplayCreateRender(vd)) {
         if (vd->ops->close != NULL)
             vd->ops->close(vd);
-- 
2.29.2