Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-11 08:38:47 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged changes from mess

Browse Source
This commit is contained in:
smf- 2012-02-24 14:22:36 +00:00
parent fe6a725e91
commit ae55397d52
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/emu/audit.c
View File

@ -142,8 +142,6 @@ m_searchpath = combinedpath;
m_record_list.reset(); m_record_list.reset();
return NOTFOUND; return NOTFOUND;
} }
else if (found == 0 && m_record_list.count() == 0)
return NONE_NEEDED;
// return a summary // return a summary
return summarize(m_enumerator.driver().name); return summarize(m_enumerator.driver().name);
@ -201,10 +199,6 @@ media_auditor::summary media_auditor::audit_device(device_t *device, const char
m_record_list.reset(); m_record_list.reset();
return NOTFOUND; return NOTFOUND;
} }
else if (found == 0 && m_record_list.count() == 0)
{
return NONE_NEEDED;
}
// return a summary // return a summary
return summarize(device->shortname()); return summarize(device->shortname());
@ -271,10 +265,6 @@ media_auditor::summary media_auditor::audit_samples()
m_record_list.reset(); m_record_list.reset();
return NOTFOUND; return NOTFOUND;
} }
else if (found == 0 && m_record_list.count() == 0)
{
return NONE_NEEDED;
}
// return a summary // return a summary
return summarize(m_enumerator.driver().name); return summarize(m_enumerator.driver().name);
@ -288,6 +278,11 @@ media_auditor::summary media_auditor::audit_samples()
media_auditor::summary media_auditor::summarize(const char *name, astring *string) media_auditor::summary media_auditor::summarize(const char *name, astring *string)
{ {
if (m_record_list.count() == 0)
{
return NONE_NEEDED;
}
// loop over records // loop over records
summary overall_status = CORRECT; summary overall_status = CORRECT;
for (audit_record *record = m_record_list.first(); record != NULL; record = record->next()) for (audit_record *record = m_record_list.first(); record != NULL; record = record->next())

13
src/emu/clifront.c
View File

@ -756,7 +756,7 @@ void cli_frontend::verifyroms(const char *gamename)
notfound++; notfound++;
// else display information about what we discovered // else display information about what we discovered
else if (summary != media_auditor::NONE_NEEDED) else
{ {
// output the summary of the audit // output the summary of the audit
astring summary_string; astring summary_string;
@ -783,6 +783,7 @@ void cli_frontend::verifyroms(const char *gamename)
break; break;
case media_auditor::BEST_AVAILABLE: case media_auditor::BEST_AVAILABLE:
case media_auditor::NONE_NEEDED:
mame_printf_info("is best available\n"); mame_printf_info("is best available\n");
correct++; correct++;
break; break;
@ -814,7 +815,7 @@ void cli_frontend::verifyroms(const char *gamename)
if (summary == media_auditor::NOTFOUND) if (summary == media_auditor::NOTFOUND)
notfound++; notfound++;
// else display information about what we discovered // else display information about what we discovered
else else if (summary != media_auditor::NONE_NEEDED)
{ {
// output the summary of the audit // output the summary of the audit
astring summary_string; astring summary_string;
@ -880,7 +881,7 @@ void cli_frontend::verifyroms(const char *gamename)
notfound++; notfound++;
// else display information about what we discovered // else display information about what we discovered
else else if(summary != media_auditor::NONE_NEEDED)
{ {
// output the summary of the audit // output the summary of the audit
astring summary_string; astring summary_string;
@ -909,8 +910,6 @@ void cli_frontend::verifyroms(const char *gamename)
break; break;
default: default:
mame_printf_info("has no roms!\n");
correct++;
break; break;
} }
} }
@ -932,7 +931,7 @@ void cli_frontend::verifyroms(const char *gamename)
throw emu_fatalerror(MAMERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename); throw emu_fatalerror(MAMERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
// if we didn't get anything at all, display a generic end message // if we didn't get anything at all, display a generic end message
if (matched == 1 && correct == 0 && incorrect == 0) if (matched > 0 && correct == 0 && incorrect == 0)
{ {
if (notfound > 0) if (notfound > 0)
throw emu_fatalerror(MAMERR_MISSING_FILES, "romset \"%s\" not found!\n", gamename); throw emu_fatalerror(MAMERR_MISSING_FILES, "romset \"%s\" not found!\n", gamename);
@ -1024,7 +1023,7 @@ void cli_frontend::verifysamples(const char *gamename)
throw emu_fatalerror(MAMERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename); throw emu_fatalerror(MAMERR_NO_SUCH_GAME, "No matching games found for '%s'", gamename);
// if we didn't get anything at all, display a generic end message // if we didn't get anything at all, display a generic end message
if (matched == 1 && correct == 0 && incorrect == 0) if (matched > 0 && correct == 0 && incorrect == 0)
{ {
if (notfound > 0) if (notfound > 0)
throw emu_fatalerror(MAMERR_MISSING_FILES, "sampleset \"%s\" not found!\n", gamename); throw emu_fatalerror(MAMERR_MISSING_FILES, "sampleset \"%s\" not found!\n", gamename);