summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author therealmogminer@gmail.com <therealmogminer@gmail.com>2016-05-16 19:58:59 +0200
committer therealmogminer@gmail.com <therealmogminer@gmail.com>2016-05-16 19:59:15 +0200
commitb06be31dfe70c4d13f88b304e7e8dab515bd0919 (patch)
tree2bbce2c5b5902b647e33853aa087c59f0d5be2fb
parent0069d44ff7f06dca7d3b233305c8e13185867615 (diff)
Move slider_state and ui_menu_item into src/frontend/mame, nw
-rw-r--r--src/emu/machine.cpp1
-rw-r--r--src/emu/ui/uimain.h47
-rw-r--r--src/frontend/mame/ui/menu.h2
-rw-r--r--src/frontend/mame/ui/menuitem.h42
-rw-r--r--src/frontend/mame/ui/slider.h36
-rw-r--r--src/frontend/mame/ui/sliders.cpp2
-rw-r--r--src/frontend/mame/ui/submenu.cpp1
-rw-r--r--src/frontend/mame/ui/ui.cpp2
-rw-r--r--src/frontend/mame/ui/ui.h4
-rw-r--r--src/osd/modules/lib/osdobj_common.h3
-rw-r--r--src/osd/modules/osdwindow.h2
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.cpp2
-rw-r--r--src/osd/modules/render/bgfx/chainmanager.h1
-rw-r--r--src/osd/modules/render/bgfx/inputpair.cpp2
-rw-r--r--src/osd/modules/render/bgfx/inputpair.h2
-rw-r--r--src/osd/modules/render/bgfx/shadermanager.h2
-rw-r--r--src/osd/modules/render/bgfx/slider.h2
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.cpp2
-rw-r--r--src/osd/modules/render/d3d/d3dhlsl.h3
-rw-r--r--src/osd/modules/render/drawbgfx.h1
-rw-r--r--src/osd/osdepend.h2
-rw-r--r--src/osd/windows/window.cpp1
22 files changed, 99 insertions, 63 deletions
diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp
index 80867963a0b..6b18f910425 100644
--- a/src/emu/machine.cpp
+++ b/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)
diff --git a/src/emu/ui/uimain.h b/src/emu/ui/uimain.h
index 5f045a9d44c..f17b4eb0cfd 100644
--- a/src/emu/ui/uimain.h
+++ b/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:
diff --git a/src/frontend/mame/ui/menu.h b/src/frontend/mame/ui/menu.h
index 041a409a2a6..c7638925cb0 100644
--- a/src/frontend/mame/ui/menu.h
+++ b/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
diff --git a/src/frontend/mame/ui/menuitem.h b/src/frontend/mame/ui/menuitem.h
new file mode 100644
index 00000000000..92ceab86628
--- /dev/null
+++ b/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__ \ No newline at end of file
diff --git a/src/frontend/mame/ui/slider.h b/src/frontend/mame/ui/slider.h
new file mode 100644
index 00000000000..ef3622a0ee5
--- /dev/null
+++ b/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__ \ No newline at end of file
diff --git a/src/frontend/mame/ui/sliders.cpp b/src/frontend/mame/ui/sliders.cpp
index c466e5aced0..54121bcc400 100644
--- a/src/frontend/mame/ui/sliders.cpp
+++ b/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)
{
diff --git a/src/frontend/mame/ui/submenu.cpp b/src/frontend/mame/ui/submenu.cpp
index 2537ef55a2d..c70d56b0f2c 100644
--- a/src/frontend/mame/ui/submenu.cpp
+++ b/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>
//-------------------------------------------------
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index fa7ad9daa53..05ba0138210 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/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());
} \ No newline at end of file
diff --git a/src/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h
index b59c36671ac..1005b50318e 100644
--- a/src/frontend/mame/ui/ui.h
+++ b/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
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 5c26b55a6d5..d9083815fa0 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/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
diff --git a/src/osd/modules/osdwindow.h b/src/osd/modules/osdwindow.h
index a2ab9228454..cd602b089f4 100644
--- a/src/osd/modules/osdwindow.h
+++ b/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
diff --git a/src/osd/modules/render/bgfx/chainmanager.cpp b/src/osd/modules/render/bgfx/chainmanager.cpp
index 8614149b7eb..6a7875547e4 100644
--- a/src/osd/modules/render/bgfx/chainmanager.cpp
+++ b/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"
diff --git a/src/osd/modules/render/bgfx/chainmanager.h b/src/osd/modules/render/bgfx/chainmanager.h
index 979c487a237..997be246073 100644
--- a/src/osd/modules/render/bgfx/chainmanager.h
+++ b/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;
diff --git a/src/osd/modules/render/bgfx/inputpair.cpp b/src/osd/modules/render/bgfx/inputpair.cpp
index 4de54404a6b..e19789b89ba 100644
--- a/src/osd/modules/render/bgfx/inputpair.cpp
+++ b/src/osd/modules/render/bgfx/inputpair.cpp
@@ -9,7 +9,7 @@
//
//============================================================
-#include "ui/uimain.h"
+#include "../frontend/mame/ui/slider.h"
#include "emucore.h"
diff --git a/src/osd/modules/render/bgfx/inputpair.h b/src/osd/modules/render/bgfx/inputpair.h
index 550595a1c55..1f5c4f59dfc 100644
--- a/src/osd/modules/render/bgfx/inputpair.h
+++ b/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;
diff --git a/src/osd/modules/render/bgfx/shadermanager.h b/src/osd/modules/render/bgfx/shadermanager.h
index 2beca465918..bee48dcea81 100644
--- a/src/osd/modules/render/bgfx/shadermanager.h
+++ b/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>
diff --git a/src/osd/modules/render/bgfx/slider.h b/src/osd/modules/render/bgfx/slider.h
index 059b895ad8f..fca9d43f6a8 100644
--- a/src/osd/modules/render/bgfx/slider.h
+++ b/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
{
diff --git a/src/osd/modules/render/d3d/d3dhlsl.cpp b/src/osd/modules/render/d3d/d3dhlsl.cpp
index 72c172b898d..a075f2748a2 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.cpp
+++ b/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"
//============================================================
diff --git a/src/osd/modules/render/d3d/d3dhlsl.h b/src/osd/modules/render/d3d/d3dhlsl.h
index c7813122308..57b34693d47 100644
--- a/src/osd/modules/render/d3d/d3dhlsl.h
+++ b/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;
diff --git a/src/osd/modules/render/drawbgfx.h b/src/osd/modules/render/drawbgfx.h
index 5e500fedb1e..76169834760 100644
--- a/src/osd/modules/render/drawbgfx.h
+++ b/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;
diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h
index b6235f7570c..977053ded89 100644
--- a/src/osd/osdepend.h
+++ b/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>
diff --git a/src/osd/windows/window.cpp b/src/osd/windows/window.cpp
index 52dfc2434d9..0edca7c79a6 100644
--- a/src/osd/windows/window.cpp
+++ b/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"