summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/windows/window.h
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-03-29 15:50:04 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-03-29 15:50:04 +0000
commit2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch)
treedb21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/osd/windows/window.h
parentb72cf3c5702b749c7bf26383ff05a9ab55022d31 (diff)
BIG update.
Remove redundant machine items from address_space and device_t. Neither machine nor m_machine are directly accessible anymore. Instead a new getter machine() is available which returns a machine reference. So: space->machine->xxx ==> space->machine().xxx device->machine->yyy ==> device->machine().yyy Globally changed all running_machine pointers to running_machine references. Any function/method that takes a running_machine takes it as a required parameter (1 or 2 exceptions). Being consistent here gets rid of a lot of odd &machine or *machine, but it does mean a very large bulk change across the project. Structs which have a running_machine * now have that variable renamed to m_machine, and now have a shiny new machine() method that works like the space and device methods above. Since most of these are things that should eventually be devices anyway, consider this a step in that direction. 98% of the update was done with regex searches. The changes are architected such that the compiler will catch the remaining errors: // find things that use an embedded machine directly and replace // with a machine() getter call S: ->machine-> R: ->machine\(\)\. // do the same if via a reference S: \.machine-> R: \.machine\(\)\. // convert function parameters to running_machine & S: running_machine \*machine([^;]) R: running_machine \&machine\1 // replace machine-> with machine. S: machine-> R: machine\. // replace &machine() with machine() S: \&([()->a-z0-9_]+machine\(\)) R: \1 // sanity check: look for this used as a cast (running_machine &) // and change to this: *(running_machine *)
Diffstat (limited to 'src/osd/windows/window.h')
-rw-r--r--src/osd/windows/window.h24
1 files changed, 13 insertions, 11 deletions
diff --git a/src/osd/windows/window.h b/src/osd/windows/window.h
index 1db97dd1e80..689708ba960 100644
--- a/src/osd/windows/window.h
+++ b/src/osd/windows/window.h
@@ -68,6 +68,8 @@
typedef struct _win_window_info win_window_info;
struct _win_window_info
{
+ running_machine &machine() const { assert(m_machine != NULL); return *m_machine; }
+
win_window_info * next;
volatile int init_state;
@@ -104,7 +106,7 @@ struct _win_window_info
// drawing data
void * drawdata;
- running_machine * machine;
+ running_machine * m_machine;
};
@@ -135,13 +137,13 @@ extern win_window_info *win_window_list;
//============================================================
// core initialization
-void winwindow_init(running_machine *machine);
+void winwindow_init(running_machine &machine);
// creation/deletion of windows
-void winwindow_video_window_create(running_machine *machine, int index, win_monitor_info *monitor, const win_window_config *config);
+void winwindow_video_window_create(running_machine &machine, int index, win_monitor_info *monitor, const win_window_config *config);
BOOL winwindow_has_focus(void);
-void winwindow_update_cursor_state(running_machine *machine);
+void winwindow_update_cursor_state(running_machine &machine);
void winwindow_video_window_update(win_window_info *window);
win_monitor_info *winwindow_video_window_monitor(win_window_info *window, const RECT *proposed);
@@ -150,17 +152,17 @@ extern LRESULT CALLBACK winwindow_video_window_proc_ui(HWND wnd, UINT message, W
void winwindow_toggle_full_screen(void);
-void winwindow_process_events_periodic(running_machine *machine);
-void winwindow_process_events(running_machine *machine, int ingame);
+void winwindow_process_events_periodic(running_machine &machine);
+void winwindow_process_events(running_machine &machine, int ingame);
-void winwindow_ui_pause_from_window_thread(running_machine *machine, int pause);
-void winwindow_ui_pause_from_main_thread(running_machine *machine, int pause);
-int winwindow_ui_is_paused(running_machine *machine);
+void winwindow_ui_pause_from_window_thread(running_machine &machine, int pause);
+void winwindow_ui_pause_from_main_thread(running_machine &machine, int pause);
+int winwindow_ui_is_paused(running_machine &machine);
void winwindow_ui_exec_on_main_thread(void (*func)(void *), void *param);
-void winwindow_dispatch_message(running_machine *machine, MSG *message);
+void winwindow_dispatch_message(running_machine &machine, MSG *message);
-extern int win_create_menu(running_machine *machine, HMENU *menus);
+extern int win_create_menu(running_machine &machine, HMENU *menus);