diff options
| author | JosJuice <josjuice@gmail.com> | 2020-05-04 18:21:49 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2020-06-17 13:48:15 +0200 |
| commit | 0d433baeb5b0f0fb19d691d2d7b37ed5fc737535 (patch) | |
| tree | 13ff418cbc44e355a1c373fb5c65911617316b13 /Source/Core | |
| parent | 1f7c0b636fd0fffbf63892a7e3c2ab0109c33185 (diff) | |
RVZ: Remove PURGE support
PURGE isn't especially useful, while requiring some annoying
special handling in the file format. If you want no compression,
use NONE. If you want fast compression, use Zstandard.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DiscIO/WIABlob.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/DolphinQt/ConvertDialog.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp index b3c9553d49..d5a8086789 100644 --- a/Source/Core/DiscIO/WIABlob.cpp +++ b/Source/Core/DiscIO/WIABlob.cpp @@ -129,7 +129,8 @@ bool WIAFileReader::Initialize(const std::string& path) const u32 compression_type = Common::swap32(m_header_2.compression_type); m_compression_type = static_cast<WIACompressionType>(compression_type); - if (m_compression_type > (m_rvz ? WIACompressionType::Zstd : WIACompressionType::LZMA2)) + if (m_compression_type > (m_rvz ? WIACompressionType::Zstd : WIACompressionType::LZMA2) || + (m_rvz && m_compression_type == WIACompressionType::Purge)) { ERROR_LOG(DISCIO, "Unsupported compression type %u in %s", compression_type, path.c_str()); return false; diff --git a/Source/Core/DolphinQt/ConvertDialog.cpp b/Source/Core/DolphinQt/ConvertDialog.cpp index f739de801a..db801581a0 100644 --- a/Source/Core/DolphinQt/ConvertDialog.cpp +++ b/Source/Core/DolphinQt/ConvertDialog.cpp @@ -226,7 +226,8 @@ void ConvertDialog::OnFormatChanged() const QString slow = tr("%1 (slow)"); AddToCompressionComboBox(tr("No Compression"), DiscIO::WIACompressionType::None); - AddToCompressionComboBox(QStringLiteral("Purge"), DiscIO::WIACompressionType::Purge); + if (format == DiscIO::BlobType::WIA) + AddToCompressionComboBox(QStringLiteral("Purge"), DiscIO::WIACompressionType::Purge); AddToCompressionComboBox(slow.arg(QStringLiteral("bzip2")), DiscIO::WIACompressionType::Bzip2); AddToCompressionComboBox(slow.arg(QStringLiteral("LZMA")), DiscIO::WIACompressionType::LZMA); AddToCompressionComboBox(slow.arg(QStringLiteral("LZMA2")), DiscIO::WIACompressionType::LZMA2); |
