show a different string for "card inserted, but we don't yet know the name on the card"
This commit is contained in:
@@ -296,6 +296,11 @@ bool MemoryCardManager::PathIsMemCard( CString sDir ) const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool MemoryCardManager::IsNameAvailable( PlayerNumber pn ) const
|
||||||
|
{
|
||||||
|
return m_Device[pn].bIsNameAvailable;
|
||||||
|
}
|
||||||
|
|
||||||
CString MemoryCardManager::GetName( PlayerNumber pn ) const
|
CString MemoryCardManager::GetName( PlayerNumber pn ) const
|
||||||
{
|
{
|
||||||
return m_Device[pn].sName;
|
return m_Device[pn].sName;
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ public:
|
|||||||
|
|
||||||
bool PathIsMemCard( CString sDir ) const;
|
bool PathIsMemCard( CString sDir ) const;
|
||||||
|
|
||||||
|
bool IsNameAvailable( PlayerNumber pn ) const;
|
||||||
CString GetName( PlayerNumber pn ) const;
|
CString GetName( PlayerNumber pn ) const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ ScreenManager* SCREENMAN = NULL; // global and accessable from anywhere in our p
|
|||||||
#define CREDITS_CARD_ERROR THEME->GetMetric ("ScreenSystemLayer","CreditsCardError")
|
#define CREDITS_CARD_ERROR THEME->GetMetric ("ScreenSystemLayer","CreditsCardError")
|
||||||
#define CREDITS_CARD_TOO_LATE THEME->GetMetric ("ScreenSystemLayer","CreditsCardTooLate")
|
#define CREDITS_CARD_TOO_LATE THEME->GetMetric ("ScreenSystemLayer","CreditsCardTooLate")
|
||||||
#define CREDITS_CARD_NO_NAME THEME->GetMetric ("ScreenSystemLayer","CreditsCardNoName")
|
#define CREDITS_CARD_NO_NAME THEME->GetMetric ("ScreenSystemLayer","CreditsCardNoName")
|
||||||
|
#define CREDITS_CARD_READY THEME->GetMetric ("ScreenSystemLayer","CreditsCardReady")
|
||||||
#define CREDITS_FREE_PLAY THEME->GetMetric ("ScreenSystemLayer","CreditsFreePlay")
|
#define CREDITS_FREE_PLAY THEME->GetMetric ("ScreenSystemLayer","CreditsFreePlay")
|
||||||
#define CREDITS_CREDITS THEME->GetMetric ("ScreenSystemLayer","CreditsCredits")
|
#define CREDITS_CREDITS THEME->GetMetric ("ScreenSystemLayer","CreditsCredits")
|
||||||
#define CREDITS_NOT_PRESENT THEME->GetMetric ("ScreenSystemLayer","CreditsNotPresent")
|
#define CREDITS_NOT_PRESENT THEME->GetMetric ("ScreenSystemLayer","CreditsNotPresent")
|
||||||
@@ -224,6 +225,8 @@ void ScreenSystemLayer::RefreshCreditsMessages()
|
|||||||
// Prefer the name of the profile over the name of the card.
|
// Prefer the name of the profile over the name of the card.
|
||||||
else if( pProfile )
|
else if( pProfile )
|
||||||
sCredits = pProfile->GetDisplayName();
|
sCredits = pProfile->GetDisplayName();
|
||||||
|
else if( !MEMCARDMAN->IsNameAvailable(p) )
|
||||||
|
sCredits = CREDITS_CARD_READY;
|
||||||
else if( !MEMCARDMAN->GetName(p).empty() )
|
else if( !MEMCARDMAN->GetName(p).empty() )
|
||||||
sCredits = MEMCARDMAN->GetName(p);
|
sCredits = MEMCARDMAN->GetName(p);
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ struct UsbStorageDevice
|
|||||||
sOsMountDir = "";
|
sOsMountDir = "";
|
||||||
bNeedsWriteTest = true;
|
bNeedsWriteTest = true;
|
||||||
bWriteTestSucceeded = false;
|
bWriteTestSucceeded = false;
|
||||||
|
bIsNameAvailable = false;
|
||||||
sName = "";
|
sName = "";
|
||||||
idVendor = 0;
|
idVendor = 0;
|
||||||
idProduct = 0;
|
idProduct = 0;
|
||||||
@@ -32,6 +33,7 @@ struct UsbStorageDevice
|
|||||||
CString sOsMountDir; // WITHOUT trailing slash
|
CString sOsMountDir; // WITHOUT trailing slash
|
||||||
bool bNeedsWriteTest;
|
bool bNeedsWriteTest;
|
||||||
bool bWriteTestSucceeded; // only valid if bNeedsWriteTest == false
|
bool bWriteTestSucceeded; // only valid if bNeedsWriteTest == false
|
||||||
|
bool bIsNameAvailable; // Name in the profile on the memory card.
|
||||||
CString sName; // Name in the profile on the memory card.
|
CString sName; // Name in the profile on the memory card.
|
||||||
int idVendor;
|
int idVendor;
|
||||||
int idProduct;
|
int idProduct;
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ void MemoryCardDriverThreaded_Windows::MountThreadDoOneUpdate()
|
|||||||
Profile profile;
|
Profile profile;
|
||||||
CString sProfileDir = TEMP_MOUNT_POINT + PREFSMAN->m_sMemoryCardProfileSubdir + '/';
|
CString sProfileDir = TEMP_MOUNT_POINT + PREFSMAN->m_sMemoryCardProfileSubdir + '/';
|
||||||
profile.LoadEditableDataFromDir( sProfileDir );
|
profile.LoadEditableDataFromDir( sProfileDir );
|
||||||
|
usbd.bIsNameAvailable = true;
|
||||||
usbd.sName = profile.GetDisplayName();
|
usbd.sName = profile.GetDisplayName();
|
||||||
UnmountMountPoint( TEMP_MOUNT_POINT );
|
UnmountMountPoint( TEMP_MOUNT_POINT );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user