mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-11 20:15:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Volume: Rename GetName to GetInternalName

Browse source 
This is intended to better separate it from GetNames and to clarify
that this name originally wasn't meant to be shown to users.
The ISOProperties GUI is also updated, mainly because labeling
the long banner name "short name" was confusing.
This commit is contained in:
JosJuice 2015-05-11 11:19:30 +02:00
commit bad09fc358
11 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/DiscIO/Volume.h
View file

@ -76,7 +76,7 @@ public:
virtual std::string GetUniqueID() const = 0;
virtual std::string GetMakerID() const = 0;
virtual int GetRevision() const = 0;
virtual std::string GetName() const = 0;
virtual std::string GetInternalName() const = 0;
virtual std::map<ELanguage, std::string> GetNames() const = 0;
virtual std::map<ELanguage, std::string> GetDescriptions() const { return std::map<ELanguage, std::string>(); }
virtual std::string GetCompany() const { return std::string(); }

4
Source/Core/DiscIO/VolumeDirectory.cpp
View file

@ -182,7 +182,7 @@ std::string CVolumeDirectory::GetMakerID() const
return "VOID";
}
std::string CVolumeDirectory::GetName() const
std::string CVolumeDirectory::GetInternalName() const
{
char name[0x60];
if (Read(0x20, 0x60, (u8*)name, false))
@ -194,7 +194,7 @@ std::string CVolumeDirectory::GetName() const
std::map<IVolume::ELanguage, std::string> CVolumeDirectory::GetNames() const
{
std::map<IVolume::ELanguage, std::string> names;
std::string name = GetName();
std::string name = GetInternalName();
if (!name.empty())
names[IVolume::ELanguage::LANGUAGE_UNKNOWN] = name;
return names;

2
Source/Core/DiscIO/VolumeDirectory.h
View file

@ -40,7 +40,7 @@ public:
std::string GetMakerID() const override;
int GetRevision() const override { return 0; }
std::string GetName() const override;
std::string GetInternalName() const override;
std::map<IVolume::ELanguage, std::string> GetNames() const override;
void SetName(const std::string&);

2
Source/Core/DiscIO/VolumeGC.cpp
View file

@ -96,7 +96,7 @@ int CVolumeGC::GetRevision() const
return revision;
}
std::string CVolumeGC::GetName() const
std::string CVolumeGC::GetInternalName() const
{
char name[0x60];
if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)name))

2
Source/Core/DiscIO/VolumeGC.h
View file

@ -28,7 +28,7 @@ public:
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
virtual std::string GetName() const override;
virtual std::string GetInternalName() const override;
std::map<ELanguage, std::string> GetNames() const override;
std::map<ELanguage, std::string> GetDescriptions() const override;
std::string GetCompany() const override;

2
Source/Core/DiscIO/VolumeWad.h
View file

@ -31,7 +31,7 @@ public:
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
std::string GetName() const override { return ""; }
std::string GetInternalName() const override { return ""; }
std::map<IVolume::ELanguage, std::string> GetNames() const override;
u32 GetFSTSize() const override { return 0; }
std::string GetApploaderDate() const override { return ""; }

2
Source/Core/DiscIO/VolumeWiiCrypted.cpp
View file

@ -193,7 +193,7 @@ int CVolumeWiiCrypted::GetRevision() const
return revision;
}
std::string CVolumeWiiCrypted::GetName() const
std::string CVolumeWiiCrypted::GetInternalName() const
{
char name_buffer[0x60];
if (m_pReader != nullptr && Read(0x20, 0x60, (u8*)&name_buffer, false))

2
Source/Core/DiscIO/VolumeWiiCrypted.h
View file

@ -31,7 +31,7 @@ public:
std::string GetUniqueID() const override;
std::string GetMakerID() const override;
int GetRevision() const override;
std::string GetName() const override;
std::string GetInternalName() const override;
std::map<IVolume::ELanguage, std::string> GetNames() const override;
u32 GetFSTSize() const override;
std::string GetApploaderDate() const override;