Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 15:32:45 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #743 from ajrhacker/options

Browse Source 
Allow software selected from UI to install slot defaults
This commit is contained in:
R. Belmont 2016-03-26 21:47:59 -04:00
commit 5db0501a3b
3 changed files with 54 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/emu/emuopts.cpp
View File

@ -376,6 +376,9 @@ void emu_options::remove_device_options()
remove_entry(*curentry);
}
// take also care of ramsize options
set_default_value(OPTION_RAMSIZE, "");
// reset counters
m_slot_options = 0;
m_device_options = 0;
@ -541,20 +544,66 @@ void emu_options::set_system_name(const char *name)
{
// remember the original system name
std::string old_system_name(system_name());
bool new_system = old_system_name.compare(name)!=0;
// if the system name changed, fix up the device options
if (old_system_name.compare(name)!=0)
if (new_system)
{
// first set the new name
std::string error;
set_value(OPTION_SYSTEMNAME, name, OPTION_PRIORITY_CMDLINE, error);
assert(error.empty());
// remove any existing device options and then add them afresh
// remove any existing device options
remove_device_options();
while (add_slot_options()) { }
}
// get the new system
const game_driver *cursystem = system();
if (cursystem == nullptr)
return;
if (software_name())
{
std::string sw_load(software_name());
std::string sw_list, sw_name, sw_part, sw_instance, option_errors, error_string;
int left = sw_load.find_first_of(':');
int middle = sw_load.find_first_of(':', left + 1);
int right = sw_load.find_last_of(':');
sw_list = sw_load.substr(0, left - 1);
sw_name = sw_load.substr(left + 1, middle - left - 1);
sw_part = sw_load.substr(middle + 1, right - middle - 1);
sw_instance = sw_load.substr(right + 1);
sw_load.assign(sw_load.substr(0, right));
// look up the software part
machine_config config(*cursystem, *this);
software_list_device *swlist = software_list_device::find_by_name(config, sw_list.c_str());
software_info *swinfo = swlist->find(sw_name.c_str());
software_part *swpart = swinfo->find_part(sw_part.c_str());
// then add the options
if (new_system)
{
while (add_slot_options(swpart)) { }
add_device_options();
}
set_value(OPTION_SOFTWARENAME, sw_name.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
if (exists(sw_instance.c_str()))
set_value(sw_instance.c_str(), sw_load.c_str(), OPTION_PRIORITY_SUBCMD, error_string);
int num;
do {
num = options_count();
update_slot_options(swpart);
} while(num != options_count());
}
else if (new_system)
{
// add the options afresh
while (add_slot_options()) { }
add_device_options();
int num;
do {

33
src/emu/mame.cpp
View File

@ -251,40 +251,9 @@ int machine_manager::execute()
// check the state of the machine
if (m_new_driver_pending)
{
std::string old_system_name(m_options.system_name());
bool new_system = (old_system_name.compare(m_new_driver_pending->name)!=0);
// first: if we scheduled a new system, remove device options of the old system
// notice that, if we relaunch the same system, there is no effect on the emulation
if (new_system)
m_options.remove_device_options();
// second: set up new system name (and the related device options)
// set up new system name and adjust device options accordingly
m_options.set_system_name(m_new_driver_pending->name);
// third: if we scheduled a new system, take also care of ramsize options
if (new_system)
{
std::string error_string;
m_options.set_value(OPTION_RAMSIZE, "", OPTION_PRIORITY_CMDLINE, error_string);
}
firstrun = true;
if (m_options.software_name())
{
std::string sw_load(m_options.software_name());
std::string sw_list, sw_name, sw_part, sw_instance, option_errors, error_string;
int left = sw_load.find_first_of(':');
int middle = sw_load.find_first_of(':', left + 1);
int right = sw_load.find_last_of(':');
sw_list = sw_load.substr(0, left - 1);
sw_name = sw_load.substr(left + 1, middle - left - 1);
sw_part = sw_load.substr(middle + 1, right - middle - 1);
sw_instance = sw_load.substr(right + 1);
sw_load.assign(sw_load.substr(0, right));
char arg[] = "mame";
char *argv = &arg[0];
m_options.set_value(OPTION_SOFTWARENAME, sw_name.c_str(), OPTION_PRIORITY_CMDLINE, error_string);
m_options.parse_slot_devices(1, &argv, option_errors, sw_instance.c_str(), sw_load.c_str());
}
}
else
{

1
src/osd/modules/render/bgfx/targetmanager.cpp
View File

@ -25,6 +25,7 @@ target_manager::target_manager(texture_manager& textures)
: m_textures(textures)
, m_screen_count(0)
{
(void)m_options; // prevent carping about unused variable
}
target_manager::~target_manager()