diff options
author | 2011-03-29 15:50:04 +0000 | |
---|---|---|
committer | 2011-03-29 15:50:04 +0000 | |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/emu/sound/sn76477.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/sn76477.c')
-rw-r--r-- | src/emu/sound/sn76477.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/emu/sound/sn76477.c b/src/emu/sound/sn76477.c index 15852105526..1c62f699fa9 100644 --- a/src/emu/sound/sn76477.c +++ b/src/emu/sound/sn76477.c @@ -253,7 +253,7 @@ struct _sn76477_state /* others */ sound_stream *channel; /* returned by stream_create() */ - int sample_rate; /* from machine->sample_rate() */ + int sample_rate; /* from machine.sample_rate() */ device_t *device; wav_file *file; /* handle of the wave file to produce */ @@ -1988,13 +1988,13 @@ static STREAM_UPDATE( SN76477_update ) #if TEST_MODE - static int recursing = 0; /* we need to prevent recursion since enable_w calls input_code_pressed_once(device->machine, KEYCODE_SPACE->update */ + static int recursing = 0; /* we need to prevent recursion since enable_w calls input_code_pressed_once(device->machine(), KEYCODE_SPACE->update */ if () && !recursing) { recursing = 1; - device->machine->sound().system_enable(); + device->machine().sound().system_enable(); SN76477_test_enable_w(sn, !sn->enable); } @@ -2406,7 +2406,7 @@ static DEVICE_START( sn76477 ) sn->device = device; - sn->channel = device->machine->sound().stream_alloc(*device, 0, 1, device->machine->sample_rate(), sn, SN76477_update); + sn->channel = device->machine().sound().stream_alloc(*device, 0, 1, device->machine().sample_rate(), sn, SN76477_update); if (device->clock() > 0) { @@ -2414,7 +2414,7 @@ static DEVICE_START( sn76477 ) } else { - sn->sample_rate = device->machine->sample_rate(); + sn->sample_rate = device->machine().sample_rate(); } intialize_noise(sn); |