diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2019-06-20 13:37:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 13:37:24 +0200 |
| commit | 4885130799a357eee8e279ed68dac60d6bcd78ca (patch) | |
| tree | 01260bc72811143b0153b747d0d8b860638325eb /Source/Core/DiscIO/CompressedBlob.cpp | |
| parent | baf02194c1bf4a55620e3aee7d9c0a1658a61168 (diff) | |
| parent | 4f1f55093fcf98aa1592b6b8b1ad0d33c4461b50 (diff) | |
Merge pull request #8194 from lioncash/common-msg
Common/MsgHandler: Tidy up interface and namespace code
Diffstat (limited to 'Source/Core/DiscIO/CompressedBlob.cpp')
| -rw-r--r-- | Source/Core/DiscIO/CompressedBlob.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index 20584cf845..76b7506cb2 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -200,7 +200,7 @@ bool CompressFileToBlob(const std::string& infile_path, const std::string& outfi if (deflateInit(&z, 9) != Z_OK) return false; - callback(GetStringT("Files opened, ready to compress."), 0, arg); + callback(Common::GetStringT("Files opened, ready to compress."), 0, arg); CompressedBlobHeader header; header.magic_cookie = GCZ_MAGIC; @@ -239,8 +239,8 @@ bool CompressFileToBlob(const std::string& infile_path, const std::string& outfi if (inpos != 0) ratio = (int)(100 * position / inpos); - std::string temp = - StringFromFormat(GetStringT("%i of %i blocks. Compression ratio %i%%").c_str(), i, + const std::string temp = + StringFromFormat(Common::GetStringT("%i of %i blocks. Compression ratio %i%%").c_str(), i, header.num_blocks, ratio); bool was_cancelled = !callback(temp, (float)i / (float)header.num_blocks, arg); if (was_cancelled) @@ -332,7 +332,7 @@ bool CompressFileToBlob(const std::string& infile_path, const std::string& outfi if (success) { - callback(GetStringT("Done compressing disc image."), 1.0f, arg); + callback(Common::GetStringT("Done compressing disc image."), 1.0f, arg); } return success; } @@ -381,7 +381,8 @@ bool DecompressBlobToFile(const std::string& infile_path, const std::string& out { if (i % progress_monitor == 0) { - bool was_cancelled = !callback(GetStringT("Unpacking"), (float)i / (float)num_buffers, arg); + const bool was_cancelled = + !callback(Common::GetStringT("Unpacking"), (float)i / (float)num_buffers, arg); if (was_cancelled) { success = false; |