diff options
Diffstat (limited to 'src/emu/screen.h')
-rw-r--r-- | src/emu/screen.h | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/src/emu/screen.h b/src/emu/screen.h index b723a3589ac..31487c7d4ea 100644 --- a/src/emu/screen.h +++ b/src/emu/screen.h @@ -8,6 +8,8 @@ ***************************************************************************/ +#include <utility> + #pragma once #ifndef __EMU_H__ @@ -76,8 +78,8 @@ class screen_bitmap { private: // internal helpers - bitmap_t &live() { assert(m_live != NULL); return *m_live; } - const bitmap_t &live() const { assert(m_live != NULL); return *m_live; } + bitmap_t &live() { assert(m_live != nullptr); return *m_live; } + const bitmap_t &live() const { assert(m_live != nullptr); return *m_live; } public: // construction/destruction @@ -126,7 +128,7 @@ public: { case BITMAP_FORMAT_IND16: m_live = &m_ind16; break; case BITMAP_FORMAT_RGB32: m_live = &m_rgb32; break; - default: m_live = NULL; break; + default: m_live = nullptr; break; } m_ind16.reset(); m_rgb32.reset(); @@ -193,7 +195,7 @@ public: static void static_set_video_attributes(device_t &device, UINT32 flags); // information getters - render_container &container() const { assert(m_container != NULL); return *m_container; } + render_container &container() const { assert(m_container != nullptr); return *m_container; } bitmap_ind8 &priority() { return m_priority; } palette_device *palette() { return m_palette; } @@ -216,7 +218,7 @@ public: attotime time_until_vblank_end() const; attotime time_until_update() const { return (m_video_attributes & VIDEO_UPDATE_AFTER_VBLANK) ? time_until_vblank_end() : time_until_vblank_start(); } attotime scan_period() const { return attotime(0, m_scantime); } - attotime frame_period() const { return (this == NULL) ? DEFAULT_FRAME_PERIOD : attotime(0, m_frame_period); }; + attotime frame_period() const { return (this == nullptr) ? DEFAULT_FRAME_PERIOD : attotime(0, m_frame_period); }; UINT64 frame_number() const { return m_frame_number; } // updating @@ -228,7 +230,7 @@ public: // additional helpers void register_vblank_callback(vblank_state_delegate vblank_callback); void register_screen_bitmap(bitmap_t &bitmap); - + // internal to the video system bool update_quads(); void update_burnin(); @@ -248,12 +250,12 @@ private: }; // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); - virtual void device_post_load(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; + virtual void device_post_load() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // internal helpers void set_container(render_container &container) { m_container = &container; } @@ -319,8 +321,8 @@ private: { public: callback_item(vblank_state_delegate callback) - : m_next(NULL), - m_callback(callback) { } + : m_next(nullptr), + m_callback(std::move(callback)) { } callback_item *next() const { return m_next; } callback_item * m_next; @@ -333,7 +335,7 @@ private: { public: auto_bitmap_item(bitmap_t &bitmap) - : m_next(NULL), + : m_next(nullptr), m_bitmap(bitmap) { } auto_bitmap_item *next() const { return m_next; } @@ -455,13 +457,13 @@ typedef device_type_iterator<&device_creator<screen_device>, screen_device> scre template<class _FunctionClass> inline screen_update_ind16_delegate screen_update_delegate_smart(UINT32 (_FunctionClass::*callback)(screen_device &, bitmap_ind16 &, const rectangle &), const char *name, const char *devname) { - return screen_update_ind16_delegate(callback, name, devname, (_FunctionClass *)0); + return screen_update_ind16_delegate(callback, name, devname, (_FunctionClass *)nullptr); } template<class _FunctionClass> inline screen_update_rgb32_delegate screen_update_delegate_smart(UINT32 (_FunctionClass::*callback)(screen_device &, bitmap_rgb32 &, const rectangle &), const char *name, const char *devname) { - return screen_update_rgb32_delegate(callback, name, devname, (_FunctionClass *)0); + return screen_update_rgb32_delegate(callback, name, devname, (_FunctionClass *)nullptr); } |