summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/osd/modules/lib')
-rw-r--r--src/osd/modules/lib/osdlib_win32.cpp4
-rw-r--r--src/osd/modules/lib/osdobj_common.h29
2 files changed, 16 insertions, 17 deletions
diff --git a/src/osd/modules/lib/osdlib_win32.cpp b/src/osd/modules/lib/osdlib_win32.cpp
index 85334fd8ddc..75218574aff 100644
--- a/src/osd/modules/lib/osdlib_win32.cpp
+++ b/src/osd/modules/lib/osdlib_win32.cpp
@@ -77,7 +77,7 @@ int osd_setenv(const char *name, const char *value, int overwrite)
if (!overwrite)
{
- if (osd_getenv(name) != NULL)
+ if (osd_getenv(name) != nullptr)
return 0;
}
buf = (char *) osd_malloc_array(strlen(name)+strlen(value)+2);
@@ -217,7 +217,7 @@ void osd_free(void *ptr)
void *osd_alloc_executable(size_t size)
{
- return VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+ return VirtualAlloc(nullptr, size, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
}
diff --git a/src/osd/modules/lib/osdobj_common.h b/src/osd/modules/lib/osdobj_common.h
index ddbc8c974d4..d1aca5f4e43 100644
--- a/src/osd/modules/lib/osdobj_common.h
+++ b/src/osd/modules/lib/osdobj_common.h
@@ -166,20 +166,20 @@ public:
virtual void register_options();
// general overridables
- virtual void init(running_machine &machine);
- virtual void update(bool skip_redraw);
+ virtual void init(running_machine &machine) override;
+ virtual void update(bool skip_redraw) override;
// debugger overridables
- virtual void init_debugger();
- virtual void wait_for_debugger(device_t &device, bool firststop);
+ virtual void init_debugger() override;
+ virtual void wait_for_debugger(device_t &device, bool firststop) override;
// audio overridables
- virtual void update_audio_stream(const INT16 *buffer, int samples_this_frame);
- virtual void set_mastervolume(int attenuation);
- virtual bool no_sound();
+ virtual void update_audio_stream(const INT16 *buffer, int samples_this_frame) override;
+ virtual void set_mastervolume(int attenuation) override;
+ virtual bool no_sound() override;
// input overridables
- virtual void customize_input_type_list(simple_list<input_type_entry> &typelist);
+ virtual void customize_input_type_list(simple_list<input_type_entry> &typelist) override;
// font overridables
virtual osd_font *font_open(const char *name, int &height);
@@ -187,20 +187,20 @@ public:
virtual bool font_get_bitmap(osd_font *font, unicode_char chnum, bitmap_argb32 &bitmap, INT32 &width, INT32 &xoffs, INT32 &yoffs);
// video overridables
- virtual void *get_slider_list();
+ virtual void *get_slider_list() override;
// command option overrides
- virtual bool execute_command(const char *command);
+ virtual bool execute_command(const char *command) override;
- osd_font *font_alloc() { return m_font_module->font_alloc(); }
+ virtual osd_font *font_alloc() override { return m_font_module->font_alloc(); }
- osd_midi_device *create_midi_device() { return m_midi->create_midi_device(); }
+ virtual osd_midi_device *create_midi_device() override { return m_midi->create_midi_device(); }
// FIXME: everything below seems to be osd specific and not part of
// this INTERFACE but part of the osd IMPLEMENTATION
// getters
- running_machine &machine() { assert(m_machine != NULL); return *m_machine; }
+ running_machine &machine() { assert(m_machine != nullptr); return *m_machine; }
virtual void debugger_update();
@@ -227,7 +227,7 @@ public:
osd_options &options() { return m_options; }
// osd_output interface ...
- virtual void output_callback(osd_output_channel channel, const char *msg, va_list args);
+ virtual void output_callback(osd_output_channel channel, const char *msg, va_list args) override;
protected:
virtual bool input_init();
@@ -267,7 +267,6 @@ protected:
debug_module* m_debugger;
midi_module* m_midi;
private:
- //tagmap_t<osd_video_type> m_video_options;
std::vector<const char *> m_video_names;
};