diff options
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 |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/emu/sound/k005289.c | |
parent | b72cf3c5702b749c7bf26383ff05a9ab55022d31 (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/emu/sound/k005289.c')
-rw-r--r-- | src/emu/sound/k005289.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emu/sound/k005289.c b/src/emu/sound/k005289.c index a33ce5c7e98..d8c14c66998 100644 --- a/src/emu/sound/k005289.c +++ b/src/emu/sound/k005289.c @@ -68,7 +68,7 @@ INLINE k005289_state *get_safe_token(device_t *device) } /* build a table to divide by the number of voices */ -static void make_mixer_table(running_machine *machine, k005289_state *info, int voices) +static void make_mixer_table(running_machine &machine, k005289_state *info, int voices) { int count = voices * 128; int i; @@ -164,14 +164,14 @@ static DEVICE_START( k005289 ) /* get stream channels */ info->rate = device->clock()/16; - info->stream = device->machine->sound().stream_alloc(*device, 0, 1, info->rate, info, K005289_update); + info->stream = device->machine().sound().stream_alloc(*device, 0, 1, info->rate, info, K005289_update); info->mclock = device->clock(); /* allocate a pair of buffers to mix into - 1 second's worth should be more than enough */ - info->mixer_buffer = auto_alloc_array(device->machine, short, 2 * info->rate); + info->mixer_buffer = auto_alloc_array(device->machine(), short, 2 * info->rate); /* build the mixer table */ - make_mixer_table(device->machine, info, 2); + make_mixer_table(device->machine(), info, 2); info->sound_prom = *device->region(); |