From 2a4d7c4aa866c300bd538bd8eb14bb714bda9bce Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 17 Dec 2019 23:18:17 +0100
Subject: command, vo: remove old option change notification mechanisms

These all have been replaced recently.

There was a leftover in window.swift. It couldn't have done anything
useful in the current state of the code, so drop these lines.
---
 video/out/cocoa-cb/window.swift |  2 --
 video/out/vo.h                  | 14 +-------------
 2 files changed, 1 insertion(+), 15 deletions(-)

(limited to 'video/out')

diff --git a/video/out/cocoa-cb/window.swift b/video/out/cocoa-cb/window.swift
index 6e53ef309c..42aa23a6d7 100644
--- a/video/out/cocoa-cb/window.swift
+++ b/video/out/cocoa-cb/window.swift
@@ -230,7 +230,6 @@ class Window: NSWindow, NSWindowDelegate {
         setFrame(targetFrame, display: true)
         endAnimation()
         isInFullscreen = true
-        cocoaCB.flagEvents(VO_EVENT_FULLSCREEN_STATE)
         cocoaCB.layer?.update()
     }
 
@@ -242,7 +241,6 @@ class Window: NSWindow, NSWindowDelegate {
         styleMask.remove(.fullScreen)
         endAnimation()
         isInFullscreen = false
-        cocoaCB.flagEvents(VO_EVENT_FULLSCREEN_STATE)
         cocoaCB.layer?.update()
     }
 
diff --git a/video/out/vo.h b/video/out/vo.h
index 94582cd8e5..f50df6c179 100644
--- a/video/out/vo.h
+++ b/video/out/vo.h
@@ -45,14 +45,13 @@ enum {
     VO_EVENT_LIVE_RESIZING              = 1 << 5,
     // Legacy. Use m_config_cache_write_opt() instead to update the fullscreen
     // option.
-    VO_EVENT_FULLSCREEN_STATE           = 1 << 6,
     // Special thing for encode mode (vo_driver.initially_blocked).
     // Part of VO_EVENTS_USER to make vo_is_ready_for_frame() work properly.
     VO_EVENT_INITIAL_UNBLOCK            = 1 << 7,
 
     // Set of events the player core may be interested in.
     VO_EVENTS_USER = VO_EVENT_RESIZE | VO_EVENT_WIN_STATE |
-                     VO_EVENT_FULLSCREEN_STATE | VO_EVENT_INITIAL_UNBLOCK,
+                     VO_EVENT_INITIAL_UNBLOCK,
 };
 
 enum mp_voctrl {
@@ -85,14 +84,6 @@ enum mp_voctrl {
     VOCTRL_UNINIT,
     VOCTRL_RECONFIG,
 
-    // Legacy stuff.
-    VOCTRL_FULLSCREEN,
-    VOCTRL_ONTOP,
-    VOCTRL_BORDER,
-    VOCTRL_ALL_WORKSPACES,
-    VOCTRL_GET_FULLSCREEN,
-    VOCTRL_GET_WIN_STATE,               // int* (VO_WIN_STATE_* flags)
-
     VOCTRL_UPDATE_WINDOW_TITLE,         // char*
     VOCTRL_UPDATE_PLAYBACK_STATE,       // struct voctrl_playback_state*
 
@@ -132,9 +123,6 @@ enum mp_voctrl {
     VOCTRL_EXTERNAL_RESIZE,
 };
 
-// VOCTRL_GET_WIN_STATE (legacy, ignored)
-#define VO_WIN_STATE_MINIMIZED (1 << 0)
-
 #define VO_TRUE         true
 #define VO_FALSE        false
 #define VO_ERROR        -1
-- 
cgit v1.2.3