diff options
author | 2016-01-04 04:06:13 +0000 | |
---|---|---|
committer | 2016-01-04 04:06:13 +0000 | |
commit | cc00b13b9259fc957d7f1698db49f283037298af (patch) | |
tree | 8ead5074561428ad20c5cd0fdaa92c804f34310e /src/osd/modules/lib/osdobj_common.cpp | |
parent | 823a779de2763f6834eb3f5db727348ddf09ac85 (diff) | |
parent | a3f2c5abcd892fec0aeffbb0d661490bcf295108 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.cpp')
-rw-r--r-- | src/osd/modules/lib/osdobj_common.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp index 39767eb6210..f6dc6aabdae 100644 --- a/src/osd/modules/lib/osdobj_common.cpp +++ b/src/osd/modules/lib/osdobj_common.cpp @@ -13,8 +13,6 @@ #include "osdepend.h" #include "modules/lib/osdobj_common.h" -extern bool g_print_verbose; - const options_entry osd_options::s_option_entries[] = { { NULL, NULL, OPTION_HEADER, "OSD KEYBOARD MAPPING OPTIONS" }, @@ -155,6 +153,7 @@ osd_options::osd_options() osd_common_t::osd_common_t(osd_options &options) : osd_output(), m_machine(NULL), m_options(options), + m_print_verbose(false), m_sound(NULL), m_debugger(NULL) { @@ -278,10 +277,12 @@ void osd_common_t::output_callback(osd_output_channel channel, const char *msg, vfprintf(stderr, msg, args); break; case OSD_OUTPUT_CHANNEL_INFO: - case OSD_OUTPUT_CHANNEL_VERBOSE: case OSD_OUTPUT_CHANNEL_LOG: vfprintf(stdout, msg, args); break; + case OSD_OUTPUT_CHANNEL_VERBOSE: + if (verbose()) vfprintf(stdout, msg, args); + break; case OSD_OUTPUT_CHANNEL_DEBUG: #ifdef MAME_DEBUG vfprintf(stdout, msg, args); @@ -333,7 +334,7 @@ void osd_common_t::init(running_machine &machine) osd_options &options = downcast<osd_options &>(machine.options()); // extract the verbose printing option if (options.verbose()) - g_print_verbose = true; + set_verbose(true); // ensure we get called on the way out machine.add_notifier(MACHINE_NOTIFY_EXIT, machine_notify_delegate(FUNC(osd_common_t::osd_exit), this)); |