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

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Feb  1 08:08:04 2021 +0100| [554c2cfab446c0c417eeadfca5434e8a98c9fa09] | committer: Steve Lhomme

display: remove dead and deprecated OS2 code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=554c2cfab446c0c417eeadfca5434e8a98c9fa09
---

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

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index df9e81eb6d..58a0c2e430 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -92,9 +92,6 @@ typedef struct vlc_video_align {
  */
 typedef struct vout_display_cfg {
     struct vout_window_t *window; /**< Window */
-#if defined(__OS2__)
-    bool is_fullscreen VLC_DEPRECATED;  /* Is the display fullscreen */
-#endif
 
     /** Display properties */
     struct {
@@ -146,14 +143,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 9ada4bedd4..b66fe39c55 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);