From cc37b7037f61b8be15bd385cee39a9a7493286a3 Mon Sep 17 00:00:00 2001
From: libretroadmin <reallibretroretroarch@gmail.com>
Date: Sun, 27 Nov 2022 23:08:14 +0100
Subject: [PATCH] Move enum screensavers to menu_defines.h

---
 config.def.h            |  5 -----
 menu/menu_defines.h     | 11 +++++++++++
 menu/menu_screensaver.h | 11 +----------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/config.def.h b/config.def.h
index f42f6d2068..0025868faa 100644
--- a/config.def.h
+++ b/config.def.h
@@ -43,11 +43,6 @@
 #include "dingux/dingux_utils.h"
 #endif
 
-/* Required for menu screensaver animation */
-#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) || defined(HAVE_OZONE)
-#include "menu/menu_screensaver.h"
-#endif
-
 /* Required for 'show inputs on overlay' setting */
 #if defined(HAVE_OVERLAY)
 #include "../input/input_overlay.h"
diff --git a/menu/menu_defines.h b/menu/menu_defines.h
index 422e70840c..a934ff5454 100644
--- a/menu/menu_defines.h
+++ b/menu/menu_defines.h
@@ -464,6 +464,17 @@ enum dingux_rs90_softfilter_type
 };
 #endif
 
+/* Specifies all available screensaver effects */
+enum menu_screensaver_effect
+{
+   MENU_SCREENSAVER_BLANK = 0,
+   MENU_SCREENSAVER_SNOW,
+   MENU_SCREENSAVER_STARFIELD,
+   MENU_SCREENSAVER_VORTEX,
+   MENU_SCREENSAVER_LAST
+};
+
+
 RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_screensaver.h b/menu/menu_screensaver.h
index 5ded79429b..ab8c45edd7 100644
--- a/menu/menu_screensaver.h
+++ b/menu/menu_screensaver.h
@@ -20,6 +20,7 @@
 #include <retro_common_api.h>
 #include <libretro.h>
 
+#include "menu_defines.h"
 #include "../retroarch.h"
 #include "../gfx/gfx_display.h"
 #include "../gfx/gfx_animation.h"
@@ -29,16 +30,6 @@ RETRO_BEGIN_DECLS
 /* Prevent direct access to menu_screensaver_t members */
 typedef struct menu_ss_handle menu_screensaver_t;
 
-/* Specifies all available screensaver effects */
-enum menu_screensaver_effect
-{
-   MENU_SCREENSAVER_BLANK = 0,
-   MENU_SCREENSAVER_SNOW,
-   MENU_SCREENSAVER_STARFIELD,
-   MENU_SCREENSAVER_VORTEX,
-   MENU_SCREENSAVER_LAST
-};
-
 /******************/
 /* Initialisation */
 /******************/