[vlc-commits] include: move window state enum to <vlc_vout_window.h>

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri May 18 21:26:49 2018 +0300| [e92bc3093f224e4e70f49718d7ace0f7a02188c1] | committer: Rémi Denis-Courmont

include: move window state enum to <vlc_vout_window.h>

...from <vlc_vout_display.h>. Also remove unused member.

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

 include/vlc_vout_display.h | 10 ----------
 include/vlc_vout_window.h  |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 58fb1dca4f..4d0f418dea 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -63,16 +63,6 @@ typedef enum
 } vout_display_align_t;
 
 /**
- * Window management state.
- */
-enum {
-    VOUT_WINDOW_STATE_NORMAL=0,
-    VOUT_WINDOW_STATE_ABOVE=1,
-    VOUT_WINDOW_STATE_BELOW=2,
-    VOUT_WINDOW_STACK_MASK=3,
-};
-
-/**
  * Initial/Current configuration for a vout_display_t
  */
 typedef struct {
diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index d2f0014771..0c79ea8152 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -66,6 +66,15 @@ enum vout_window_control {
 };
 
 /**
+ * Window management state.
+ */
+enum {
+    VOUT_WINDOW_STATE_NORMAL,
+    VOUT_WINDOW_STATE_ABOVE,
+    VOUT_WINDOW_STATE_BELOW,
+};
+
+/**
  * Window mouse event type for vout_window_mouse_event_t
  */
 enum vout_window_mouse_event_type {