empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor finding systype by extension/name

Browse source
This commit is contained in:
Ilari Liusvaara 2013-01-15 07:31:44 +02:00
parent 98886e8143
commit 908b875319
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/core/rom.cpp
View file

@ -173,6 +173,25 @@ namespace
core_type* current_rom_type = &type_null; core_type* current_rom_type = &type_null;
core_region* current_region = &null_region; core_region* current_region = &null_region;
core_type* find_core_by_extension(const std::string& ext)
{
std::list<core_type*> possible = core_type::get_core_types();
for(auto i : possible)
if(i->is_known_extension(ext))
return i;
return NULL;
}
core_type* find_core_by_name(const std::string& name)
{
std::list<core_type*> possible = core_type::get_core_types();
for(auto i : possible)
if(i->get_iname() == name)
return i;
return NULL;
}
} }
loaded_slot::loaded_slot() throw(std::bad_alloc) loaded_slot::loaded_slot() throw(std::bad_alloc)
@ -274,7 +293,6 @@ loaded_rom::loaded_rom() throw()
loaded_rom::loaded_rom(const std::string& file) throw(std::bad_alloc, std::runtime_error) loaded_rom::loaded_rom(const std::string& file) throw(std::bad_alloc, std::runtime_error)
{ {
std::list<core_type*> possible = core_type::get_core_types();
std::istream& spec = open_file_relative(file, ""); std::istream& spec = open_file_relative(file, "");
std::string s; std::string s;
std::getline(spec, s); std::getline(spec, s);
@ -284,11 +302,7 @@ loaded_rom::loaded_rom(const std::string& file) throw(std::bad_alloc, std::runti
//This is a Raw ROM image. //This is a Raw ROM image.
regex_results tmp; regex_results tmp;
std::string ext = regex(".*\\.([^.]*)?", file, "Unknown ROM file type")[1]; std::string ext = regex(".*\\.([^.]*)?", file, "Unknown ROM file type")[1];
core_type* coretype = NULL; core_type* coretype = find_core_by_extension(ext);
for(auto i : possible) {
if(i->is_known_extension(ext))
coretype = i;
}
if(!coretype) if(!coretype)
throw std::runtime_error("Unknown ROM file type"); throw std::runtime_error("Unknown ROM file type");
rtype = coretype; rtype = coretype;
@ -319,11 +333,8 @@ loaded_rom::loaded_rom(const std::string& file) throw(std::bad_alloc, std::runti
} }
//Detect type. //Detect type.
rtype = &type_null; rtype = find_core_by_name(platname);
for(auto i : possible) if(!rtype)
if(i->get_iname() == platname)
rtype = i;
if(rtype == &type_null)
(stringfmt() << "Not a valid system type '" << platname << "'").throwex(); (stringfmt() << "Not a valid system type '" << platname << "'").throwex();
//Detect region. //Detect region.