actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-10 01:05:58 +00:00
parent 48a313372b
commit cc5798a416
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp
+4 -7
View File
@@ -19,7 +19,7 @@ MemoryCardDriverThreaded_Windows::~MemoryCardDriverThreaded_Windows()
{ {
} }
static bool TestReady( const CString &sDrive, CString &sVolumeLabelOut ) static bool TestReady( const CString &sDrive, UsbStorageDevice *pDevice )
{ {
TCHAR szVolumeNameBuffer[MAX_PATH]; TCHAR szVolumeNameBuffer[MAX_PATH];
DWORD dwVolumeSerialNumber; DWORD dwVolumeSerialNumber;
@@ -36,7 +36,7 @@ static bool TestReady( const CString &sDrive, CString &sVolumeLabelOut )
&lpFileSystemFlags, &lpFileSystemFlags,
szFileSystemNameBuffer, szFileSystemNameBuffer,
sizeof(szFileSystemNameBuffer) ); sizeof(szFileSystemNameBuffer) );
sVolumeLabelOut = szVolumeNameBuffer; pDevice->sVolumeLabel = szVolumeNameBuffer;
return bRet; return bRet;
} }
@@ -107,13 +107,10 @@ bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vector<UsbStora
sDrives += ", "; sDrives += ", ";
sDrives += sDrive; sDrives += sDrive;
CString sVolumeLabel;
if( !TestReady(sDrive, sVolumeLabel) )
continue;
UsbStorageDevice usbd; UsbStorageDevice usbd;
if( !TestReady(sDrive, &usbd) )
continue;
usbd.SetOsMountDir( sDrive ); usbd.SetOsMountDir( sDrive );
usbd.sVolumeLabel = sVolumeLabel;
if( TestWrite(sDrive) ) if( TestWrite(sDrive) )
usbd.m_State = UsbStorageDevice::STATE_READY; usbd.m_State = UsbStorageDevice::STATE_READY;
else else