diff options
author | 2016-03-18 22:41:17 +0100 | |
---|---|---|
committer | 2016-03-18 22:41:17 +0100 | |
commit | e39daaf5bdcf21d64abf239e1133963643dc6df1 (patch) | |
tree | 1f1b5f333e84bf056ce82c27bebdbad933f26c0d /src/emu/ui/selsoft.h | |
parent | 421656e108e7091ee9e1b14c84f0a3f6efc2ad2e (diff) | |
parent | b79020559ea3617b2d6bd4c92041d314045e2938 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Diffstat (limited to 'src/emu/ui/selsoft.h')
-rw-r--r-- | src/emu/ui/selsoft.h | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/emu/ui/selsoft.h b/src/emu/ui/selsoft.h index afb28c48134..a3d121f52c7 100644 --- a/src/emu/ui/selsoft.h +++ b/src/emu/ui/selsoft.h @@ -14,12 +14,8 @@ #include "ui/custmenu.h" -struct s_bios -{ - s_bios(std::string _name, int _id) { name = _name; id = _id; } - std::string name; - int id; -}; +using s_bios = std::vector<std::pair<std::string, int>>; +using s_parts = std::unordered_map<std::string, std::string>; // Menu Class class ui_menu_select_software : public ui_menu @@ -69,7 +65,7 @@ private: class ui_software_parts : public ui_menu { public: - ui_software_parts(running_machine &machine, render_container *container, std::unordered_map<std::string, std::string> parts, ui_software_info *ui_info); + ui_software_parts(running_machine &machine, render_container *container, s_parts parts, ui_software_info *ui_info); virtual ~ui_software_parts(); virtual void populate() override; virtual void handle() override; @@ -77,13 +73,13 @@ public: private: ui_software_info *m_uiinfo; - std::unordered_map<std::string, std::string> m_parts; + s_parts m_parts; }; class ui_bios_selection : public ui_menu { public: - ui_bios_selection(running_machine &machine, render_container *container, std::vector<s_bios> biosname, void *driver, bool software, bool inlist); + ui_bios_selection(running_machine &machine, render_container *container, s_bios biosname, void *driver, bool software, bool inlist); virtual ~ui_bios_selection(); virtual void populate() override; virtual void handle() override; @@ -91,9 +87,9 @@ public: private: - void *m_driver; - bool m_software, m_inlist; - std::vector<s_bios> m_bios; + void *m_driver; + bool m_software, m_inlist; + s_bios m_bios; }; struct reselect_last @@ -108,7 +104,7 @@ private: }; // Getter -bool has_multiple_bios(const game_driver *driver, std::vector<s_bios> &biosname); +bool has_multiple_bios(const game_driver *driver, s_bios &biosname); #endif /* __UI_SELSOFT_H__ */ |