Revise the way that cdrom and dvd rom drives are identified in linux to remove reduntant drive listings. Also no longer checking mount points (in fstap and mtab). This can give redundant listings, and GC/Wii backup discs can not be mounted anyway. This prevents multiple listings from appearing in the GameListCtrl when "Show Drives" is selected.

Some general code cleanup, and removed a PanicAlert (made it a NOTICE_LOG instead) so that only one panic alert is shown when attempting to load from dvd/cdrom drives, and none are shown when "Show Drives" is selected from the menu.  

Also removed the hack introduced in revision 5564 that prevents the GameListCtrl from being properly updated when a game is loaded from the command line or via the autostart feature of the debugger.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5848 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-07-07 19:47:45 +00:00
commit 0ad71eda6b
6 changed files with 91 additions and 259 deletions

View file

@ -120,7 +120,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
// that gave an incorrect file name
if (!bootDrive && !File::Exists(m_strFilename.c_str()))
{
PanicAlert("The file you specified (%s) does not exists", m_strFilename.c_str());
PanicAlert("The specified file \"%s\" does not exist", m_strFilename.c_str());
return false;
}
@ -136,9 +136,10 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
if (pVolume == NULL)
{
PanicAlert(bootDrive ?
"Disc in %s could not be read - no disc, or not a GC/Wii backup.\n"
"Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives.":
"Your GCM/ISO file seems to be invalid, or not a GC/Wii ISO.", m_strFilename.c_str());
"Could not read \"%s\". There is no disc in the drive, or it is not a GC/Wii backup. "
"Please note that original Gamecube and Wii discs cannot be read by most PC DVD drives." :
"\"%s\" is an invalid GCM/ISO file, or is not a GC/Wii ISO."
, m_strFilename.c_str());
return false;
}
m_strName = pVolume->GetName();