diff options
author | 2008-02-18 05:58:18 +0000 | |
---|---|---|
committer | 2008-02-18 05:58:18 +0000 | |
commit | 3e34860ccc59b665eddc286ba2b5d4959ec70261 (patch) | |
tree | d1d6a5bf3dc6bb69e63a38a7d21279b37ed865ee /src/emu/clifront.c | |
parent | 07290e4c0e6703014359333edcfe5bc1ba71a833 (diff) |
Removed expand_machine_driver().
Replaced with machine_config_alloc() and machine_config_free().
Updated all call sites.
Normalized info.c style and simplified some of the code.
Diffstat (limited to 'src/emu/clifront.c')
-rw-r--r-- | src/emu/clifront.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c index baeefa5cb4c..fa7f214579d 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -558,17 +558,14 @@ int cli_info_listsamples(core_options *options, const char *gamename) for (drvindex = 0; drivers[drvindex]; drvindex++) if (mame_strwildcmp(gamename, drivers[drvindex]->name) == 0) { - machine_config drv; + machine_config *config = machine_config_alloc(drivers[drvindex]->drv); int sndnum; - /* expand the machine driver */ - expand_machine_driver(drivers[drvindex]->drv, &drv); - /* find samples interfaces */ - for (sndnum = 0; sndnum < MAX_SOUND && drv.sound[sndnum].type != SOUND_DUMMY; sndnum++) - if (drv.sound[sndnum].type == SOUND_SAMPLES) + for (sndnum = 0; sndnum < MAX_SOUND && config->sound[sndnum].type != SOUND_DUMMY; sndnum++) + if (config->sound[sndnum].type == SOUND_SAMPLES) { - const char *const *samplenames = ((const struct Samplesinterface *)drv.sound[sndnum].config)->samplenames; + const char *const *samplenames = ((const struct Samplesinterface *)config->sound[sndnum].config)->samplenames; int sampnum; /* if the list is legit, walk it and print the sample info */ @@ -578,6 +575,7 @@ int cli_info_listsamples(core_options *options, const char *gamename) } count++; + machine_config_free(config); } /* clean up our tracked resources */ |