diff options
author | 2016-06-06 19:19:22 +0200 | |
---|---|---|
committer | 2016-06-06 19:19:22 +0200 | |
commit | 2293caeae45ee2816a3237b452d4e4927de5f29c (patch) | |
tree | 8eb36f8aa689796355f2608b0e162927da9dde16 /src/osd/modules/lib/osdobj_common.cpp | |
parent | 6ee9d158377f96a42c6b0f8967d9e7b1010b5b29 (diff) | |
parent | 6fbb28f063b358d62dd8822b548da604a3b95e25 (diff) |
Merge remote-tracking branch 'refs/remotes/origin/master' into mamedev/master
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.cpp')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index a709a9a8c52..9ba54892f51 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -255,6 +255,7 @@ void osd_common_t::register_options() REGISTER_MODULE(m_mod_man, OUTPUT_NONE); REGISTER_MODULE(m_mod_man, OUTPUT_CONSOLE); REGISTER_MODULE(m_mod_man, OUTPUT_NETWORK); + REGISTER_MODULE(m_mod_man, OUTPUT_WIN32); // after initialization we know which modules are supported @@ -643,6 +644,7 @@ void osd_common_t::init_subsystems() m_midi = select_module_options<midi_module *>(options(), OSD_MIDI_PROVIDER); m_output = select_module_options<output_module *>(options(), OSD_OUTPUT_PROVIDER); + m_output->set_machine(&machine()); machine().output().set_notifier(nullptr, output_notifier_callback, this); m_mod_man.init(options()); |