summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author dankan1890 <mewuidev2@gmail.com>2016-04-03 18:45:34 +0200
committer dankan1890 <mewuidev2@gmail.com>2016-04-03 18:45:34 +0200
commit37f39ecf3cc38737b79f030be67debba687be962 (patch)
treeaf9073ab147c1898dc88fd112260fb9c3f9b1943 /src
parent91f12fe7962fc7bd8307dc70b1388dd92d109499 (diff)
Small changes. (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/ui/dsplmenu.cpp3
-rw-r--r--src/emu/ui/ui.cpp12
-rw-r--r--src/lib/util/options.cpp6
-rw-r--r--src/lib/util/options.h2
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp3
5 files changed, 13 insertions, 13 deletions
diff --git a/src/emu/ui/dsplmenu.cpp b/src/emu/ui/dsplmenu.cpp
index e47164de356..02e5e75611b 100644
--- a/src/emu/ui/dsplmenu.cpp
+++ b/src/emu/ui/dsplmenu.cpp
@@ -64,7 +64,6 @@ ui_menu_display_options::ui_menu_display_options(running_machine &machine, rende
// create video list
m_list.push_back("auto");
- m_list.push_back("opengl"); // TODO: check USE_OPENGL
std::string descr = options.description(OSDOPTION_VIDEO);
descr.erase(0, descr.find(":") + 2);
@@ -80,7 +79,7 @@ ui_menu_display_options::ui_menu_display_options(running_machine &machine, rende
{
std::string txt(descr.substr(p1, p2 - p1));
if (txt != "or" && txt != "none")
- m_list.push_back(descr.substr(p1, p2 - p1));
+ m_list.push_back(txt);
}
else
{
diff --git a/src/emu/ui/ui.cpp b/src/emu/ui/ui.cpp
index 9bb27762c3b..ab295c8d5fe 100644
--- a/src/emu/ui/ui.cpp
+++ b/src/emu/ui/ui.cpp
@@ -1633,17 +1633,9 @@ UINT32 ui_manager::handler_ingame(running_machine &machine, render_container *co
// toggle pause
if (machine.ui_input().pressed(IPT_UI_PAUSE))
- {
- // with a shift key, it is single step
-// if (is_paused && (machine.input().code_pressed(KEYCODE_LSHIFT) || machine.input().code_pressed(KEYCODE_RSHIFT)))
-// {
-// machine.ui().set_single_step(true);
-// machine.resume();
-// }
-// else
- machine.toggle_pause();
- }
+ machine.toggle_pause();
+ // pause single step
if (machine.ui_input().pressed(IPT_UI_PAUSE_SINGLE))
{
machine.ui().set_single_step(true);
diff --git a/src/lib/util/options.cpp b/src/lib/util/options.cpp
index 7e8b993c0b2..58d8e86ca6a 100644
--- a/src/lib/util/options.cpp
+++ b/src/lib/util/options.cpp
@@ -836,3 +836,9 @@ bool core_options::validate_and_set_data(core_options::entry &curentry, const ch
curentry.set_value(data.c_str(), priority);
return true;
}
+
+inline core_options::entry *core_options::get_entry(const char *name) const
+{
+ auto curentry = m_entrymap.find(name);
+ return (curentry != m_entrymap.end()) ? curentry->second : nullptr;
+} \ No newline at end of file
diff --git a/src/lib/util/options.h b/src/lib/util/options.h
index a6c003162fd..d2f016f1cdc 100644
--- a/src/lib/util/options.h
+++ b/src/lib/util/options.h
@@ -131,7 +131,7 @@ public:
// getters
entry *first() const { return m_entrylist.first(); }
const char *command() const { return m_command.c_str(); }
- entry *get_entry(const char *option) { return (m_entrymap.find(option) != m_entrymap.end()) ? m_entrymap.find(option)->second : nullptr; }
+ entry *get_entry(const char *name) const;
// range iterators
using auto_iterator = simple_list<entry>::auto_iterator;
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index a1ab9ab7677..b4c0d68915e 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -303,6 +303,9 @@ void osd_common_t::register_options()
// Register video options and update options
video_options_add("none", nullptr);
+#if USE_OPENGL
+ video_options_add("opengl", nullptr);
+#endif
video_register();
update_option(OSDOPTION_VIDEO, m_video_names);
}