summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/output.c
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/sdl/output.c
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/sdl/output.c')
-rw-r--r--src/osd/sdl/output.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/sdl/output.c b/src/osd/sdl/output.c
index 7f2f7c585aa..0381ef16e0b 100644
--- a/src/osd/sdl/output.c
+++ b/src/osd/sdl/output.c
@@ -71,11 +71,11 @@ PID_CAST osd_getpid(void)
// sdloutput_init
//============================================================
-void sdloutput_init(running_machine *machine)
+void sdloutput_init(running_machine &machine)
{
int fildes;
- machine->add_notifier(MACHINE_NOTIFY_EXIT, sdloutput_exit);
+ machine.add_notifier(MACHINE_NOTIFY_EXIT, sdloutput_exit);
fildes = open(SDLMAME_OUTPUT, O_RDWR | O_NONBLOCK);
@@ -89,7 +89,7 @@ void sdloutput_init(running_machine *machine)
output = fdopen(fildes, "w");
mame_printf_verbose("ouput: opened output notifier file %s\n", SDLMAME_OUTPUT);
- fprintf(output, "MAME " PID_FMT " START %s\n", osd_getpid(), machine->system().name);
+ fprintf(output, "MAME " PID_FMT " START %s\n", osd_getpid(), machine.system().name);
fflush(output);
}
@@ -134,7 +134,7 @@ static void notifier_callback(const char *outname, INT32 value, void *param)
// Stub for win32
//============================================================
-void sdloutput_init(running_machine *machine)
+void sdloutput_init(running_machine &machine)
{
}