diff options
author | Ryan Holtz <therealmogminer@gmail.com> | 2018-03-11 11:16:58 +0100 |
---|---|---|
committer | Ryan Holtz <therealmogminer@gmail.com> | 2018-03-11 11:17:16 +0100 |
commit | 81a35fb46e22d8efcc19d92ae7b85656b2e36c13 (patch) | |
tree | 92eccca5f0db347c60be7a3c64a0269c3d1c125c /src/frontend | |
parent | 1a89b550fa69946a34f5e16e76fc1b18927a495f (diff) |
Remove all uses of first_screen() from core files, nw
Diffstat (limited to 'src/frontend')
-rw-r--r-- | src/frontend/mame/ui/cheatopt.cpp | 2 | ||||
-rw-r--r-- | src/frontend/mame/ui/ui.cpp | 15 | ||||
-rw-r--r-- | src/frontend/mame/ui/viewgfx.cpp | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/src/frontend/mame/ui/cheatopt.cpp b/src/frontend/mame/ui/cheatopt.cpp index 0e911aa0972..3982a7c7a33 100644 --- a/src/frontend/mame/ui/cheatopt.cpp +++ b/src/frontend/mame/ui/cheatopt.cpp @@ -176,7 +176,7 @@ menu_cheat::~menu_cheat() menu_autofire::menu_autofire(mame_ui_manager &mui, render_container &container) : menu(mui, container), last_toggle(false) { - const screen_device *screen = mui.machine().first_screen(); + const screen_device *screen = screen_device_iterator(mui.machine().root_device()).first(); if (screen == nullptr) { diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp index df5089cb1c0..9fe360d3891 100644 --- a/src/frontend/mame/ui/ui.cpp +++ b/src/frontend/mame/ui/ui.cpp @@ -1213,9 +1213,13 @@ uint32_t mame_ui_manager::handler_ingame(render_container &container) if (machine().ui_input().pressed(IPT_UI_TOGGLE_CHEAT)) mame_machine_manager::instance()->cheat().set_enable(!mame_machine_manager::instance()->cheat().enabled()); - // toggle movie recording - if (machine().ui_input().pressed(IPT_UI_RECORD_MOVIE)) - machine().video().toggle_record_movie(); + // toggle MNG recording + if (machine().ui_input().pressed(IPT_UI_RECORD_MNG)) + machine().video().toggle_record_mng(); + + // toggle MNG recording + if (machine().ui_input().pressed(IPT_UI_RECORD_AVI)) + machine().video().toggle_record_avi(); // toggle profiler display if (machine().ui_input().pressed(IPT_UI_SHOW_PROFILER)) @@ -1676,9 +1680,10 @@ int32_t mame_ui_manager::slider_refresh(running_machine &machine, void *arg, int const rectangle &visarea = screen->visible_area(); screen->configure(width, height, visarea, HZ_TO_ATTOSECONDS(defrefresh + (double)newval * 0.001)); } + if (str) - *str = string_format(_("%1$.3ffps"), ATTOSECONDS_TO_HZ(machine.first_screen()->frame_period().attoseconds())); - refresh = ATTOSECONDS_TO_HZ(machine.first_screen()->frame_period().attoseconds()); + *str = string_format(_("%1$.3ffps"), ATTOSECONDS_TO_HZ(screen->frame_period().attoseconds())); + refresh = ATTOSECONDS_TO_HZ(screen->frame_period().attoseconds()); return floor((refresh - defrefresh) * 1000.0 + 0.5); } diff --git a/src/frontend/mame/ui/viewgfx.cpp b/src/frontend/mame/ui/viewgfx.cpp index 560dc30d0f9..0625caa1ada 100644 --- a/src/frontend/mame/ui/viewgfx.cpp +++ b/src/frontend/mame/ui/viewgfx.cpp @@ -1320,7 +1320,11 @@ static void tilemap_update_bitmap(running_machine &machine, ui_gfx_state &state, { state.bitmap->fill(0); tilemap_t *tilemap = machine.tilemap().find(state.tilemap.which); - tilemap->draw_debug(*machine.first_screen(), *state.bitmap, state.tilemap.xoffs, state.tilemap.yoffs, state.tilemap.flags); + screen_device *first_screen = screen_device_iterator(machine.root_device()).first(); + if (first_screen) + { + tilemap->draw_debug(*first_screen, *state.bitmap, state.tilemap.xoffs, state.tilemap.yoffs, state.tilemap.flags); + } // reset the texture to force an update state.texture->set_bitmap(*state.bitmap, state.bitmap->cliprect(), TEXFORMAT_RGB32); |