summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/lib/osdobj_common.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-01-27 08:35:08 +0100
committer ImJezze <jezze@gmx.net>2016-01-27 08:35:08 +0100
commit0d1e14b771ed72d8e9a0d42fd05ebfe6fe63016a (patch)
tree10258b6f255e00e7eec2ec30112d6de07015c475 /src/osd/modules/lib/osdobj_common.cpp
parent8d5848718c30a960d07d569937cb1678f75f0463 (diff)
parentb1d6f6d63f8294a3f62d7db6f9eea07da1d93664 (diff)
Merge pull request #10 from mamedev/master
Sync to base master
Diffstat (limited to 'src/osd/modules/lib/osdobj_common.cpp')
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index 39767eb6210..b36bbf60df3 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)
{
@@ -186,6 +185,7 @@ void osd_common_t::register_options()
REGISTER_MODULE(m_mod_man, SOUND_COREAUDIO);
REGISTER_MODULE(m_mod_man, SOUND_JS);
REGISTER_MODULE(m_mod_man, SOUND_SDL);
+ REGISTER_MODULE(m_mod_man, SOUND_XAUDIO2);
REGISTER_MODULE(m_mod_man, SOUND_NONE);
#ifdef SDLMAME_MACOSX
@@ -278,10 +278,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 +335,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));