From cabfc056fddc0d246e1e3dd1d262bb629d55430d Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 24 Apr 2005 19:33:46 +0000 Subject: [PATCH] API --- stepmania/src/Profile.cpp | 5 +++-- stepmania/src/Profile.h | 2 +- .../src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp | 2 +- .../src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/stepmania/src/Profile.cpp b/stepmania/src/Profile.cpp index 3f412f6302..1126c662d1 100644 --- a/stepmania/src/Profile.cpp +++ b/stepmania/src/Profile.cpp @@ -1014,13 +1014,14 @@ void Profile::LoadEditableDataFromDir( CString sDir ) CLAMP( m_iWeightPounds, 50, 500 ); } -CString Profile::FastLoadProfileNameFromMemoryCard( CString sDir ) +bool Profile::FastLoadProfileNameFromMemoryCard( CString sDir, CString &sName ) { CString sProfileDir = sDir + PREFSMAN->m_sMemoryCardProfileSubdir + '/'; Profile profile; profile.LoadEditableDataFromDir( sProfileDir ); - return profile.GetDisplayName(); + sName = profile.GetDisplayName(); + return true; } void Profile::LoadGeneralDataFromNode( const XNode* pNode ) diff --git a/stepmania/src/Profile.h b/stepmania/src/Profile.h index 213fc32b5f..19d987ee20 100644 --- a/stepmania/src/Profile.h +++ b/stepmania/src/Profile.h @@ -283,7 +283,7 @@ public: bool SaveAllToDir( CString sDir, bool bSignData ) const; void LoadEditableDataFromDir( CString sDir ); - static CString FastLoadProfileNameFromMemoryCard( CString sDir ); + static bool FastLoadProfileNameFromMemoryCard( CString sDir, CString &sName ); LoadResult LoadStatsXmlFromNode( const XNode* pNode ); void LoadGeneralDataFromNode( const XNode* pNode ); void LoadSongScoresFromNode( const XNode* pNode ); diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp index 4a66dc2b1f..bb7b1b473b 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp @@ -238,7 +238,7 @@ bool MemoryCardDriverThreaded_Linux::DoOneUpdate( bool bMount, vectorMount( "dir", d.sOsMountDir, TEMP_MOUNT_POINT ); - d.sName = Profile::FastLoadProfileNameFromMemoryCard( TEMP_MOUNT_POINT ); + d.bIsNameAvailable = Profile::FastLoadProfileNameFromMemoryCard( TEMP_MOUNT_POINT, d.sName ); FILEMAN->Unmount( "dir", d.sOsMountDir, TEMP_MOUNT_POINT ); } diff --git a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp index 9223107649..a3e0c0683b 100644 --- a/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp +++ b/stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Windows.cpp @@ -99,7 +99,7 @@ bool MemoryCardDriverThreaded_Windows::DoOneUpdate( bool bMount, vectorMount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL ); FILEMAN->Mount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT ); - usbd.sName = Profile::FastLoadProfileNameFromMemoryCard( TEMP_MOUNT_POINT ); + usbd.bIsNameAvailable = Profile::FastLoadProfileNameFromMemoryCard( TEMP_MOUNT_POINT, usbd.sName ); FILEMAN->Unmount( "timeout", TEMP_MOUNT_POINT_INTERNAL, TEMP_MOUNT_POINT ); FILEMAN->Unmount( "dir", usbd.sOsMountDir, TEMP_MOUNT_POINT_INTERNAL );