summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/lib
diff options
context:
space:
mode:
author andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
committer andreasnaive <andreasnaive@gmail.com>2019-03-25 23:13:40 +0100
commitb380514764cf857469bae61c11143a19f79a74c5 (patch)
tree63c8012e262618f08a332da31dd714281aa2c5ed /src/osd/modules/lib
parentc24473ddff715ecec2e258a6eb38960cf8c8e98e (diff)
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/osd/modules/lib')
-rw-r--r--src/osd/modules/lib/osdobj_common.cpp32
-rw-r--r--src/osd/modules/lib/osdobj_common.h3
2 files changed, 18 insertions, 17 deletions
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index d3f5f35192e..3cb67e6ded4 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,6 +409,7 @@ 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.
@@ -436,6 +437,7 @@ 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 af4d2d332bc..8c275ebf48d 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -245,12 +245,11 @@ 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; }
- virtual void set_verbose(bool print_verbose) override { m_print_verbose = print_verbose; }
+ void set_verbose(bool print_verbose) { 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();