diff options
Diffstat (limited to 'src/emu/uiinput.c')
-rw-r--r-- | src/emu/uiinput.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/emu/uiinput.c b/src/emu/uiinput.c index 486d710ff54..1a7af6dda67 100644 --- a/src/emu/uiinput.c +++ b/src/emu/uiinput.c @@ -59,7 +59,7 @@ struct _ui_input_private FUNCTION PROTOYPES ***************************************************************************/ -//static void ui_input_frame_update(running_machine *machine); +//static void ui_input_frame_update(running_machine &machine); @@ -72,15 +72,15 @@ struct _ui_input_private system -------------------------------------------------*/ -void ui_input_init(running_machine *machine) +void ui_input_init(running_machine &machine) { /* create the private data */ - machine->ui_input_data = auto_alloc_clear(machine, ui_input_private); - machine->ui_input_data->current_mouse_x = -1; - machine->ui_input_data->current_mouse_y = -1; + machine.ui_input_data = auto_alloc_clear(machine, ui_input_private); + machine.ui_input_data->current_mouse_x = -1; + machine.ui_input_data->current_mouse_y = -1; /* add a frame callback to poll inputs */ - machine->add_notifier(MACHINE_NOTIFY_FRAME, ui_input_frame_update); + machine.add_notifier(MACHINE_NOTIFY_FRAME, ui_input_frame_update); } @@ -103,7 +103,7 @@ void ui_input_frame_update(running_machine &machine) /* update the state of all the UI keys */ for (code = __ipt_ui_start; code <= __ipt_ui_end; code++) { - int pressed = input_seq_pressed(&machine, input_type_seq(&machine, code, 0, SEQ_TYPE_STANDARD)); + int pressed = input_seq_pressed(machine, input_type_seq(machine, code, 0, SEQ_TYPE_STANDARD)); if (!pressed || uidata->seqpressed[code] != SEQ_PRESSED_RESET) uidata->seqpressed[code] = pressed; } @@ -115,9 +115,9 @@ void ui_input_frame_update(running_machine &machine) onto the queue -------------------------------------------------*/ -int ui_input_push_event(running_machine *machine, ui_event evt) +int ui_input_push_event(running_machine &machine, ui_event evt) { - ui_input_private *uidata = machine->ui_input_data; + ui_input_private *uidata = machine.ui_input_data; /* we may be called before the UI is initialized */ if (uidata == NULL) @@ -168,9 +168,9 @@ int ui_input_push_event(running_machine *machine, ui_event evt) ui_input_pop_event - pops an event off of the queue -------------------------------------------------*/ -int ui_input_pop_event(running_machine *machine, ui_event *evt) +int ui_input_pop_event(running_machine &machine, ui_event *evt) { - ui_input_private *uidata = machine->ui_input_data; + ui_input_private *uidata = machine.ui_input_data; int result; if (uidata->events_start != uidata->events_end) @@ -193,9 +193,9 @@ int ui_input_pop_event(running_machine *machine, ui_event *evt) and resets the sequence states -------------------------------------------------*/ -void ui_input_reset(running_machine *machine) +void ui_input_reset(running_machine &machine) { - ui_input_private *uidata = machine->ui_input_data; + ui_input_private *uidata = machine.ui_input_data; int code; uidata->events_start = 0; @@ -213,9 +213,9 @@ void ui_input_reset(running_machine *machine) location of the mouse -------------------------------------------------*/ -render_target *ui_input_find_mouse(running_machine *machine, INT32 *x, INT32 *y, int *button) +render_target *ui_input_find_mouse(running_machine &machine, INT32 *x, INT32 *y, int *button) { - ui_input_private *uidata = machine->ui_input_data; + ui_input_private *uidata = machine.ui_input_data; if (x != NULL) *x = uidata->current_mouse_x; if (y != NULL) @@ -237,7 +237,7 @@ render_target *ui_input_find_mouse(running_machine *machine, INT32 *x, INT32 *y, detected -------------------------------------------------*/ -int ui_input_pressed(running_machine *machine, int code) +int ui_input_pressed(running_machine &machine, int code) { return ui_input_pressed_repeat(machine, code, 0); } @@ -250,9 +250,9 @@ int ui_input_pressed(running_machine *machine, int code) is triggered -------------------------------------------------*/ -int ui_input_pressed_repeat(running_machine *machine, int code, int speed) +int ui_input_pressed_repeat(running_machine &machine, int code, int speed) { - ui_input_private *uidata = machine->ui_input_data; + ui_input_private *uidata = machine.ui_input_data; int pressed = FALSE; g_profiler.start(PROFILER_INPUT); |