summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2019-01-12 18:17:13 +1100
committer Vas Crabb <vas@vastheman.com>2019-01-12 18:17:13 +1100
commit19612b1f10214581e73e72ba42e9531ac48e4ffe (patch)
tree778992ae06d3226d5f2e1c1a4bb01dd7f4f2f3da /src/osd
parentb053f0d4839853f8f862a80a75f18d63ae2f3e99 (diff)
apply -verbose after processing command-line options and after first pass over .ini files (nw)
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp32
-rw-r--r--src/osd/modules/lib/osdobj_common.h3
-rw-r--r--src/osd/osdepend.h5
3 files changed, 20 insertions, 20 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index 3cb67e6ded4..d3f5f35192e 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -163,7 +163,7 @@ const options_entry osd_options::s_option_entries[] =
};
osd_options::osd_options()
-: emu_options()
+ : emu_options()
{
add_entries(osd_options::s_option_entries);
}
@@ -176,20 +176,20 @@ std::list<std::shared_ptr<osd_window>> osd_common_t::s_window_list;
//-------------------------------------------------
osd_common_t::osd_common_t(osd_options &options)
- : osd_output(), m_machine(nullptr),
- m_options(options),
- m_print_verbose(false),
- m_font_module(nullptr),
- m_sound(nullptr),
- m_debugger(nullptr),
- m_midi(nullptr),
- m_keyboard_input(nullptr),
- m_mouse_input(nullptr),
- m_lightgun_input(nullptr),
- m_joystick_input(nullptr),
- m_output(nullptr),
- m_monitor_module(nullptr),
- m_watchdog(nullptr)
+ : osd_output(), m_machine(nullptr)
+ , m_options(options)
+ , m_print_verbose(false)
+ , m_font_module(nullptr)
+ , m_sound(nullptr)
+ , m_debugger(nullptr)
+ , m_midi(nullptr)
+ , m_keyboard_input(nullptr)
+ , m_mouse_input(nullptr)
+ , m_lightgun_input(nullptr)
+ , m_joystick_input(nullptr)
+ , m_output(nullptr)
+ , m_monitor_module(nullptr)
+ , m_watchdog(nullptr)
{
osd_output::push(this);
}
@@ -409,7 +409,6 @@ void osd_common_t::output_callback(osd_output_channel channel, const char *msg,
void osd_common_t::init(running_machine &machine)
{
- //
// This function is responsible for initializing the OSD-specific
// video and input functionality, and registering that functionality
// with the MAME core.
@@ -437,7 +436,6 @@ void osd_common_t::init(running_machine &machine)
//
// Audio initialization may eventually move into here as well,
// instead of relying on independent callbacks from each system.
- //
m_machine = &machine;
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index 8c275ebf48d..af4d2d332bc 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -245,11 +245,12 @@ public:
// osd_output interface ...
virtual void output_callback(osd_output_channel channel, const char *msg, va_list args) override;
bool verbose() const { return m_print_verbose; }
- void set_verbose(bool print_verbose) { m_print_verbose = print_verbose; }
+ virtual void set_verbose(bool print_verbose) override { m_print_verbose = print_verbose; }
void notify(const char *outname, int32_t value) const { m_output->notify(outname, value); }
static std::list<std::shared_ptr<osd_window>> s_window_list;
+
protected:
virtual bool input_init();
virtual void input_pause();
diff --git a/src/osd/osdepend.h b/src/osd/osdepend.h
index 07f6ddd99f1..2587b93e560 100644
--- a/src/osd/osdepend.h
+++ b/src/osd/osdepend.h
@@ -7,11 +7,11 @@
OS-dependent code interface.
*******************************************************************c********/
+#ifndef MAME_OSD_OSDEPEND_H
+#define MAME_OSD_OSDEPEND_H
#pragma once
-#ifndef MAME_OSD_OSDEPEND_H
-#define MAME_OSD_OSDEPEND_H
#include "emucore.h"
#include "osdcore.h"
@@ -64,6 +64,7 @@ public:
// general overridables
virtual void init(running_machine &machine) = 0;
virtual void update(bool skip_redraw) = 0;
+ virtual void set_verbose(bool print_verbose) = 0;
// debugger overridables
virtual void init_debugger() = 0;