From 8af4296b0888155dc02992ab278ae825dc57905a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 27 Jan 2005 04:45:20 +0000 Subject: [PATCH] simplify a bit --- .../MemoryCardDriverThreaded_Windows.cpp | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp index 5519a4b415..4fecaecc0c 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp @@ -90,38 +90,38 @@ void MemoryCardDriverThreaded_Windows::MountThreadDoOneUpdate() for( int i=2; iTrace( "Found drive %s", sDrive.c_str() ); + CString sDrive = ssprintf( "%c:\\", 'a'+i%26 ); - if( GetDriveType(sDrive) != DRIVE_REMOVABLE ) // is a removable drive - continue; + LOG->Trace( "Found drive %s", sDrive.c_str() ); - if( !TestReady(sDrive) ) - continue; + if( GetDriveType(sDrive) != DRIVE_REMOVABLE ) // is a removable drive + continue; - UsbStorageDevice usbd; - usbd.SetOsMountDir( sDrive ); - usbd.bWriteTestSucceeded = TestWrite( sDrive ); + if( !TestReady(sDrive) ) + continue; - // read name - this->Mount( &usbd, TEMP_MOUNT_POINT ); - FILEMAN->Mount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL ); - FILEMAN->Mount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT ); + UsbStorageDevice usbd; + usbd.SetOsMountDir( sDrive ); + usbd.bWriteTestSucceeded = TestWrite( sDrive ); - Profile profile; - CString sProfileDir = TEMP_MOUNT_POINT + PREFSMAN->m_sMemoryCardProfileSubdir + '/'; - profile.LoadEditableDataFromDir( sProfileDir ); - usbd.bIsNameAvailable = true; - usbd.sName = profile.GetDisplayName(); + // read name + this->Mount( &usbd, TEMP_MOUNT_POINT ); + FILEMAN->Mount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL ); + FILEMAN->Mount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT ); - FILEMAN->Unmount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT ); - FILEMAN->Unmount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL ); + Profile profile; + CString sProfileDir = TEMP_MOUNT_POINT + PREFSMAN->m_sMemoryCardProfileSubdir + '/'; + profile.LoadEditableDataFromDir( sProfileDir ); + usbd.bIsNameAvailable = true; + usbd.sName = profile.GetDisplayName(); - vNewStorageDevices.push_back( usbd ); - } + FILEMAN->Unmount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT ); + FILEMAN->Unmount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL ); + + vNewStorageDevices.push_back( usbd ); } CHECKPOINT;