diff options
author | 2016-04-10 02:25:11 +0200 | |
---|---|---|
committer | 2016-04-10 02:38:08 +0200 | |
commit | 8719535cbc8341254f0b89cb5d834c7e8aa4483a (patch) | |
tree | 7b54b8a59a11257570cfc445bf0e9ca2e528c769 /src/osd/modules/lib/osdobj_common.cpp | |
parent | 74a8e5d1dd20dd7dca94425245fe7c65587a99ac (diff) |
Make sliders use an std::vector instead of a linked list, nw
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.cpp')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index 6c4fe3a3192..568b68e57c2 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -249,7 +249,7 @@ void osd_common_t::register_options() REGISTER_MODULE(m_mod_man, JOYSTICKINPUT_DINPUT); REGISTER_MODULE(m_mod_man, JOYSTICKINPUT_XINPUT); REGISTER_MODULE(m_mod_man, JOYSTICK_NONE); - + REGISTER_MODULE(m_mod_man, OUTPUT_NONE); REGISTER_MODULE(m_mod_man, OUTPUT_CONSOLE); REGISTER_MODULE(m_mod_man, OUTPUT_NETWORK); @@ -537,9 +537,9 @@ void osd_common_t::customize_input_type_list(simple_list<input_type_entry> &type // list of OS-dependent slider values. //------------------------------------------------- -slider_state* osd_common_t::get_slider_list() +std::vector<slider_state*> osd_common_t::get_slider_list() { - return nullptr; + return m_sliders; } //------------------------------------------------- @@ -612,7 +612,7 @@ void osd_common_t::init_subsystems() select_module_options<netdev_module *>(options(), OSD_NETDEV_PROVIDER); m_midi = select_module_options<midi_module *>(options(), OSD_MIDI_PROVIDER); - + m_output = select_module_options<output_module *>(options(), OSD_OUTPUT_PROVIDER); machine().output().set_notifier(NULL, output_notifier_callback, this); |