Move slider_state and ui_menu_item into src/frontend/mame, nw

src/emu/machine.cpp

@@ -80,6 +80,7 @@
 #include "debug/debugvw.h"
 #include "image.h"
 #include "network.h"
+#include "ui/uimain.h"
 #include <time.h>
 
 #if defined(EMSCRIPTEN)

src/emu/ui/uimain.h

@@ -14,58 +14,11 @@
 #define __BASIC_UI_H__
 
 #include "emu.h"
-/***************************************************************************
-    CONSTANTS
-***************************************************************************/
-
-// special menu item for separators
-#define MENU_SEPARATOR_ITEM         "---"
-
-
-#define SLIDER_NOCHANGE     0x12345678
-
-
-typedef INT32(*slider_update)(running_machine &machine, void *arg, int id, std::string *str, INT32 newval);
-
-struct slider_state
-{
-	slider_state *  next;               /* pointer to next slider */
-	slider_update   update;             /* callback */
-	void *          arg;                /* argument */
-	INT32           minval;             /* minimum value */
-	INT32           defval;             /* default value */
-	INT32           maxval;             /* maximum value */
-	INT32           incval;             /* increment value */
-	int             id;
-	char            description[1];     /* textual description */
-};
-
-// types of menu items (TODO: please expand)
-enum class ui_menu_item_type
-{
-	UNKNOWN,
-	SLIDER,
-	SEPARATOR
-};
-
-
 
 /***************************************************************************
     TYPE DEFINITIONS
 ***************************************************************************/
 
-class ui_menu_item
-{
-public:
-	const char          *text;
-	const char          *subtext;
-	UINT32              flags;
-	void                *ref;
-	ui_menu_item_type   type;   // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
-
-	inline bool is_selectable() const;
-};
-
 class ui_manager
 {
 public:

src/frontend/mame/ui/menu.h

@@ -16,7 +16,7 @@
 #include "render.h"
 #include "language.h"
 #include "ui/ui.h"
-
+#include "ui/menuitem.h"
 
 /***************************************************************************
     CONSTANTS

src/frontend/mame/ui/menuitem.h

@@ -0,0 +1,42 @@
+// license:BSD-3-Clause
+// copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods
+
+/***************************************************************************
+
+    ui/menuitem.h
+
+    Internal data representation for a UI menu item.
+
+***************************************************************************/
+
+#pragma once
+
+#ifndef __UI_MENUITEM__
+#define __UI_MENUITEM__
+
+#include "emu.h"
+
+// special menu item for separators
+#define MENU_SEPARATOR_ITEM         "---"
+
+// types of menu items (TODO: please expand)
+enum class ui_menu_item_type
+{
+	UNKNOWN,
+	SLIDER,
+	SEPARATOR
+};
+
+class ui_menu_item
+{
+public:
+	const char          *text;
+	const char          *subtext;
+	UINT32              flags;
+	void                *ref;
+	ui_menu_item_type   type;   // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
+
+	inline bool is_selectable() const;
+};
+
+#endif // __UI_MENUITEM__

src/frontend/mame/ui/slider.h

@@ -0,0 +1,36 @@
+// license:BSD-3-Clause
+// copyright-holders:Nicola Salmoria, Aaron Giles, Nathan Woods
+
+/***************************************************************************
+
+    ui/slider.h
+
+    Internal data representation for an adjustment slider.
+
+***************************************************************************/
+
+#pragma once
+
+#ifndef __UI_SLIDER__
+#define __UI_SLIDER__
+
+#include "emu.h"
+
+#define SLIDER_NOCHANGE     0x12345678
+
+typedef INT32(*slider_update)(running_machine &machine, void *arg, int id, std::string *str, INT32 newval);
+
+struct slider_state
+{
+	slider_state *  next;               /* pointer to next slider */
+	slider_update   update;             /* callback */
+	void *          arg;                /* argument */
+	INT32           minval;             /* minimum value */
+	INT32           defval;             /* default value */
+	INT32           maxval;             /* maximum value */
+	INT32           incval;             /* increment value */
+	int             id;
+	char            description[1];     /* textual description */
+};
+
+#endif // __UI_SLIDER__

src/frontend/mame/ui/sliders.cpp

@@ -14,7 +14,7 @@
 #include "ui/ui.h"
 #include "ui/menu.h"
 #include "ui/sliders.h"
-
+#include "ui/slider.h"
 
 ui_menu_sliders::ui_menu_sliders(mame_ui_manager &mui, render_container *container, bool menuless_mode) : ui_menu(mui, container)
 {

src/frontend/mame/ui/submenu.cpp

@@ -12,6 +12,7 @@
 #include "ui/ui.h"
 #include "ui/submenu.h"
 #include "ui/utils.h"
+#include "ui/menuitem.h"
 #include <limits>
 
 //-------------------------------------------------

src/frontend/mame/ui/ui.cpp

@@ -2815,5 +2815,5 @@ void mame_ui_manager::save_main_option()
 
 void mame_ui_manager::menu_reset()
 {
-	ui_menu::stack_reset(machine()); 
+	ui_menu::stack_reset(machine());
 }

src/frontend/mame/ui/ui.h

@@ -19,6 +19,8 @@
 #include "moptions.h"
 #include "language.h"
 #include "ui/uimain.h"
+#include "ui/menuitem.h"
+#include "ui/slider.h"
 
 class ui_menu_item;
 
@@ -171,7 +173,7 @@ public:
 	virtual void popup_time_string(int seconds, std::string message) override;
 
 	virtual void image_display(const device_type &type, device_image_interface *image) override;
-	
+
 	virtual void menu_reset() override;
 private:
 	// instance variables

src/osd/modules/lib/osdobj_common.h

@@ -24,8 +24,7 @@
 #include "modules/midi/midi_module.h"
 #include "modules/output/output_module.h"
 #include "emuopts.h"
-
-class ui_menu_item;
+#include "../frontend/mame/ui/menuitem.h"
 
 //============================================================
 //  Defines

src/osd/modules/osdwindow.h

@@ -10,9 +10,9 @@
 #define __OSDWINDOW__
 
 #include "emu.h"
-#include "ui/uimain.h"
 #include "render.h"
 #include "osdhelper.h"
+#include "../frontend/mame/ui/menuitem.h"
 
 // standard windows headers
 #ifdef OSD_WINDOWS

src/osd/modules/render/bgfx/chainmanager.cpp

@@ -10,7 +10,7 @@
 //============================================================
 
 #include "emu.h"
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/slider.h"
 
 #include "osdcore.h"
 #include "modules/osdwindow.h"

src/osd/modules/render/bgfx/chainmanager.h

@@ -21,6 +21,7 @@
 #include "texturemanager.h"
 #include "targetmanager.h"
 #include "effectmanager.h"
+#include "../frontend/mame/ui/menuitem.h"
 
 class running_machine;
 class osd_window;

src/osd/modules/render/bgfx/inputpair.cpp

@@ -9,7 +9,7 @@
 //
 //============================================================
 
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/slider.h"
 
 #include "emucore.h"
 

src/osd/modules/render/bgfx/inputpair.h

@@ -16,7 +16,7 @@
 
 #include <string>
 
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/menuitem.h"
 
 class bgfx_effect;
 class chain_manager;

src/osd/modules/render/bgfx/shadermanager.h

@@ -16,7 +16,7 @@
 
 #include <bgfx/bgfx.h>
 
-#include <modules/lib/osdobj_common.h>
+#include "modules/lib/osdobj_common.h"
 
 #include <map>
 #include <string>

src/osd/modules/render/bgfx/slider.h

@@ -17,7 +17,7 @@
 #include <vector>
 
 #include "emu.h"
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/slider.h"
 
 class bgfx_slider
 {

src/osd/modules/render/d3d/d3dhlsl.cpp

@@ -18,7 +18,6 @@
 #include "emu.h"
 #include "drivenum.h"
 #include "render.h"
-#include "ui/uimain.h"
 #include "rendutil.h"
 #include "emuopts.h"
 #include "aviio.h"
@@ -32,6 +31,7 @@
 #include "d3dcomm.h"
 #include "strconv.h"
 #include "d3dhlsl.h"
+#include "../frontend/mame/ui/slider.h"
 
 
 //============================================================

src/osd/modules/render/d3d/d3dhlsl.h

@@ -11,6 +11,7 @@
 
 #include <vector>
 #include "aviio.h"
+#include "../frontend/mame/ui/menuitem.h"
 
 //============================================================
 //  CONSTANTS
@@ -21,8 +22,6 @@
 //  TYPE DEFINITIONS
 //============================================================
 
-struct slider_state;
-
 class effect;
 class shaders;
 

src/osd/modules/render/drawbgfx.h

@@ -15,6 +15,7 @@
 #include "bgfx/chain.h"
 #include "bgfx/chainmanager.h"
 #include "sliderdirtynotifier.h"
+#include "../frontend/mame/ui/menuitem.h"
 
 class texture_manager;
 class target_manager;

src/osd/osdepend.h

@@ -16,7 +16,7 @@
 #include "emucore.h"
 #include "osdcore.h"
 #include "unicode.h"
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/menuitem.h"
 
 #include <memory>
 #include <string>

src/osd/windows/window.cpp

@@ -22,6 +22,7 @@
 // MAME headers
 #include "emu.h"
 #include "uiinput.h"
+#include "ui/uimain.h"
 
 // MAMEOS headers
 #include "winmain.h"