summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2015-09-26 14:46:53 +0200
committerJosJuice <josjuice@gmail.com>2015-09-26 14:46:53 +0200
commit94ee720a0745939874ff4a663fe071c847369c67 (patch)
tree4e7c75606597e9ea120b38c1983aa1fde1de92a9 /Source
parentce75f55f2544e6429e596940895eebb6c2dcb506 (diff)
Rename IsCompressedBlob to IsGCZBlob for clarity
GCZ is just one of the several compressed formats that Dolphin supports.
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DiscIO/Blob.cpp2
-rw-r--r--Source/Core/DiscIO/CompressedBlob.cpp8
-rw-r--r--Source/Core/DiscIO/CompressedBlob.h4
-rw-r--r--Source/Core/DolphinQt/GameList/GameFile.cpp2
-rw-r--r--Source/Core/DolphinWX/ISOFile.cpp2
5 files changed, 9 insertions, 9 deletions
diff --git a/Source/Core/DiscIO/Blob.cpp b/Source/Core/DiscIO/Blob.cpp
index 19cb36d8b3..9ed8577c38 100644
--- a/Source/Core/DiscIO/Blob.cpp
+++ b/Source/Core/DiscIO/Blob.cpp
@@ -129,7 +129,7 @@ IBlobReader* CreateBlobReader(const std::string& filename)
if (IsWbfsBlob(filename))
return WbfsFileReader::Create(filename);
- if (IsCompressedBlob(filename))
+ if (IsGCZBlob(filename))
return CompressedBlobReader::Create(filename);
if (IsCISOBlob(filename))
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp
index 04304b7613..5c08355175 100644
--- a/Source/Core/DiscIO/CompressedBlob.cpp
+++ b/Source/Core/DiscIO/CompressedBlob.cpp
@@ -55,7 +55,7 @@ CompressedBlobReader::CompressedBlobReader(const std::string& filename) : m_file
CompressedBlobReader* CompressedBlobReader::Create(const std::string& filename)
{
- if (IsCompressedBlob(filename))
+ if (IsGCZBlob(filename))
return new CompressedBlobReader(filename);
else
return nullptr;
@@ -148,7 +148,7 @@ bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u
{
bool scrubbing = false;
- if (IsCompressedBlob(infile))
+ if (IsGCZBlob(infile))
{
PanicAlertT("\"%s\" is already compressed! Cannot compress it further.", infile.c_str());
return false;
@@ -330,7 +330,7 @@ bool CompressFileToBlob(const std::string& infile, const std::string& outfile, u
bool DecompressBlobToFile(const std::string& infile, const std::string& outfile, CompressCB callback, void* arg)
{
- if (!IsCompressedBlob(infile))
+ if (!IsGCZBlob(infile))
{
PanicAlertT("File not compressed");
return false;
@@ -400,7 +400,7 @@ bool DecompressBlobToFile(const std::string& infile, const std::string& outfile,
return true;
}
-bool IsCompressedBlob(const std::string& filename)
+bool IsGCZBlob(const std::string& filename)
{
File::IOFile f(filename, "rb");
diff --git a/Source/Core/DiscIO/CompressedBlob.h b/Source/Core/DiscIO/CompressedBlob.h
index 7157f805b3..cfeefcd927 100644
--- a/Source/Core/DiscIO/CompressedBlob.h
+++ b/Source/Core/DiscIO/CompressedBlob.h
@@ -23,11 +23,11 @@
namespace DiscIO
{
-bool IsCompressedBlob(const std::string& filename);
+bool IsGCZBlob(const std::string& filename);
const u32 kBlobCookie = 0xB10BC001;
-// A blob file structure:
+// GCZ file structure:
// BlobHeader
// u64 offsetsToBlocks[n], top bit specifies whether the block is compressed, or not.
// compressed data
diff --git a/Source/Core/DolphinQt/GameList/GameFile.cpp b/Source/Core/DolphinQt/GameList/GameFile.cpp
index 74b24590cb..2a9e993711 100644
--- a/Source/Core/DolphinQt/GameList/GameFile.cpp
+++ b/Source/Core/DolphinQt/GameList/GameFile.cpp
@@ -113,7 +113,7 @@ GameFile::GameFile(const QString& fileName)
m_volume_size = volume->GetSize();
m_unique_id = QString::fromStdString(volume->GetUniqueID());
- m_compressed = DiscIO::IsCompressedBlob(fileName.toStdString());
+ m_compressed = DiscIO::IsGCZBlob(fileName.toStdString());
m_disc_number = volume->GetDiscNumber();
m_revision = volume->GetRevision();
diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp
index f7841742cc..1a7c939fb8 100644
--- a/Source/Core/DolphinWX/ISOFile.cpp
+++ b/Source/Core/DolphinWX/ISOFile.cpp
@@ -111,7 +111,7 @@ GameListItem::GameListItem(const std::string& _rFileName, const std::unordered_m
m_VolumeSize = pVolume->GetSize();
m_UniqueID = pVolume->GetUniqueID();
- m_BlobCompressed = DiscIO::IsCompressedBlob(_rFileName);
+ m_BlobCompressed = DiscIO::IsGCZBlob(_rFileName);
m_disc_number = pVolume->GetDiscNumber();
m_Revision = pVolume->GetRevision();