summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/screen.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-04-18 20:06:43 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-04-18 20:06:43 +0000
commitfecfc465df47655554aeb0ea33eccb0f33d498a7 (patch)
tree842317d1595fa823a6bd290b7667a66d2fc09a81 /src/emu/screen.h
parent4e7f194a638d0955374d2acf984017d5b1ed0e65 (diff)
Switch from m_machine to machine() everywhere. In some cases this
meant adding a machine() accessor but it's worth it for consistency. This will allow future changes from reference to pointer to happen transparently for devices. [Aaron Giles] Simple S&R: m_machine( *[^ (!=;]) machine()\1
Diffstat (limited to 'src/emu/screen.h')
-rw-r--r--src/emu/screen.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/screen.h b/src/emu/screen.h
index 2c7f9d3ae25..28df0a4b524 100644
--- a/src/emu/screen.h
+++ b/src/emu/screen.h
@@ -175,14 +175,14 @@ public:
// beam positioning and state
int vpos() const;
int hpos() const;
- bool vblank() const { return (m_machine.time() < m_vblank_end_time); }
+ bool vblank() const { return (machine().time() < m_vblank_end_time); }
bool hblank() const { int curpos = hpos(); return (curpos < m_visarea.min_x || curpos > m_visarea.max_x); }
// timing
attotime time_until_pos(int vpos, int hpos = 0) const;
attotime time_until_vblank_start() const { return time_until_pos(m_visarea.max_y + 1); }
attotime time_until_vblank_end() const;
- attotime time_until_update() const { return (m_machine.config().m_video_attributes & VIDEO_UPDATE_AFTER_VBLANK) ? time_until_vblank_end() : time_until_vblank_start(); }
+ attotime time_until_update() const { return (machine().config().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 || !started()) ? DEFAULT_FRAME_PERIOD : attotime(0, m_frame_period); };
UINT64 frame_number() const { return m_frame_number; }
@@ -194,7 +194,7 @@ public:
// additional helpers
void register_vblank_callback(vblank_state_changed_func vblank_callback, void *param);
- bitmap_t *alloc_compatible_bitmap(int width = 0, int height = 0) { return auto_bitmap_alloc(m_machine, (width == 0) ? m_width : width, (height == 0) ? m_height : height, m_config.m_format); }
+ bitmap_t *alloc_compatible_bitmap(int width = 0, int height = 0) { return auto_bitmap_alloc(machine(), (width == 0) ? m_width : width, (height == 0) ? m_height : height, m_config.m_format); }
// internal to the video system
bool update_quads();