diff --git a/Source/Core/DiscIO/Blob.h b/Source/Core/DiscIO/Blob.h index eec2cb8938..7e075d2655 100644 --- a/Source/Core/DiscIO/Blob.h +++ b/Source/Core/DiscIO/Blob.h @@ -196,12 +196,12 @@ using CompressCB = std::function; bool ConvertToGCZ(BlobReader* infile, const std::string& infile_path, const std::string& outfile_path, u32 sub_type, int sector_size, - CompressCB callback); + const CompressCB& callback); bool ConvertToPlain(BlobReader* infile, const std::string& infile_path, - const std::string& outfile_path, CompressCB callback); + const std::string& outfile_path, const CompressCB& callback); bool ConvertToWIAOrRVZ(BlobReader* infile, const std::string& infile_path, const std::string& outfile_path, bool rvz, WIARVZCompressionType compression_type, int compression_level, - int chunk_size, CompressCB callback); + int chunk_size, const CompressCB& callback); } // namespace DiscIO diff --git a/Source/Core/DiscIO/CompressedBlob.cpp b/Source/Core/DiscIO/CompressedBlob.cpp index a35e523e37..99a982efd9 100644 --- a/Source/Core/DiscIO/CompressedBlob.cpp +++ b/Source/Core/DiscIO/CompressedBlob.cpp @@ -243,7 +243,7 @@ static ConversionResult Compress(CompressThreadState* state, static ConversionResultCode Output(OutputParameters parameters, File::IOFile* outfile, u64* position, std::vector* offsets, int progress_monitor, - u32 num_blocks, CompressCB callback) + u32 num_blocks, const CompressCB& callback) { u64 offset = *position; if (!parameters.compressed) @@ -274,7 +274,7 @@ static ConversionResultCode Output(OutputParameters parameters, File::IOFile* ou bool ConvertToGCZ(BlobReader* infile, const std::string& infile_path, const std::string& outfile_path, u32 sub_type, int block_size, - CompressCB callback) + const CompressCB& callback) { ASSERT(infile->GetDataSizeType() == DataSizeType::Accurate); diff --git a/Source/Core/DiscIO/FileBlob.cpp b/Source/Core/DiscIO/FileBlob.cpp index 97b95d1b8d..9ba572ea77 100644 --- a/Source/Core/DiscIO/FileBlob.cpp +++ b/Source/Core/DiscIO/FileBlob.cpp @@ -47,7 +47,7 @@ bool PlainFileReader::Read(u64 offset, u64 nbytes, u8* out_ptr) } bool ConvertToPlain(BlobReader* infile, const std::string& infile_path, - const std::string& outfile_path, CompressCB callback) + const std::string& outfile_path, const CompressCB& callback) { ASSERT(infile->GetDataSizeType() == DataSizeType::Accurate); diff --git a/Source/Core/DiscIO/NANDImporter.cpp b/Source/Core/DiscIO/NANDImporter.cpp index 80b52951b0..ccba4aff48 100644 --- a/Source/Core/DiscIO/NANDImporter.cpp +++ b/Source/Core/DiscIO/NANDImporter.cpp @@ -25,7 +25,7 @@ NANDImporter::~NANDImporter() = default; void NANDImporter::ImportNANDBin(const std::string& path_to_bin, std::function update_callback, - std::function get_otp_dump_path) + const std::function& get_otp_dump_path) { m_update_callback = std::move(update_callback); @@ -40,7 +40,7 @@ void NANDImporter::ImportNANDBin(const std::string& path_to_bin, } bool NANDImporter::ReadNANDBin(const std::string& path_to_bin, - std::function get_otp_dump_path) + const std::function& get_otp_dump_path) { constexpr size_t NAND_TOTAL_BLOCKS = 0x40000; constexpr size_t NAND_BLOCK_SIZE = 0x800; diff --git a/Source/Core/DiscIO/NANDImporter.h b/Source/Core/DiscIO/NANDImporter.h index cc2bc69381..9b4260620f 100644 --- a/Source/Core/DiscIO/NANDImporter.h +++ b/Source/Core/DiscIO/NANDImporter.h @@ -27,7 +27,7 @@ public: // If the associated OTP/SEEPROM dump (keys.bin) is not included in the image, // get_otp_dump_path will be called to get a path to it. void ImportNANDBin(const std::string& path_to_bin, std::function update_callback, - std::function get_otp_dump_path); + const std::function& get_otp_dump_path); bool ExtractCertificates(); enum class Type @@ -64,7 +64,8 @@ public: #pragma pack(pop) private: - bool ReadNANDBin(const std::string& path_to_bin, std::function get_otp_dump_path); + bool ReadNANDBin(const std::string& path_to_bin, + const std::function& get_otp_dump_path); bool FindSuperblock(); std::string GetPath(const NANDFSTEntry& entry, const std::string& parent_path); std::string FormatDebugString(const NANDFSTEntry& entry); diff --git a/Source/Core/DiscIO/RiivolutionParser.cpp b/Source/Core/DiscIO/RiivolutionParser.cpp index 471813f198..6fbb4d41c4 100644 --- a/Source/Core/DiscIO/RiivolutionParser.cpp +++ b/Source/Core/DiscIO/RiivolutionParser.cpp @@ -385,7 +385,7 @@ std::vector GenerateRiivolutionPatchesFromGameModDescriptor( return result; } -std::vector GenerateRiivolutionPatchesFromConfig(const std::string root_directory, +std::vector GenerateRiivolutionPatchesFromConfig(const std::string& root_directory, const std::string& game_id, std::optional revision, std::optional disc_number) diff --git a/Source/Core/DiscIO/RiivolutionParser.h b/Source/Core/DiscIO/RiivolutionParser.h index a52cb8f7cc..0a2d1e316d 100644 --- a/Source/Core/DiscIO/RiivolutionParser.h +++ b/Source/Core/DiscIO/RiivolutionParser.h @@ -224,7 +224,7 @@ std::optional ParseString(std::string_view xml, std::string xml_path); std::vector GenerateRiivolutionPatchesFromGameModDescriptor( const GameModDescriptorRiivolution& descriptor, const std::string& game_id, std::optional revision, std::optional disc_number); -std::vector GenerateRiivolutionPatchesFromConfig(const std::string root_directory, +std::vector GenerateRiivolutionPatchesFromConfig(const std::string& root_directory, const std::string& game_id, std::optional revision, std::optional disc_number); diff --git a/Source/Core/DiscIO/WIABlob.cpp b/Source/Core/DiscIO/WIABlob.cpp index 3f91a606aa..9ee8470294 100644 --- a/Source/Core/DiscIO/WIABlob.cpp +++ b/Source/Core/DiscIO/WIABlob.cpp @@ -1700,7 +1700,7 @@ ConversionResultCode WIARVZFileReader::Output(std::vector ConversionResultCode WIARVZFileReader::RunCallback(size_t groups_written, u64 bytes_read, u64 bytes_written, u32 total_groups, - u64 iso_size, CompressCB callback) + u64 iso_size, const CompressCB& callback) { int ratio = 0; if (bytes_read != 0) @@ -2040,7 +2040,7 @@ WIARVZFileReader::Convert(BlobReader* infile, const VolumeDisc* infile_volu bool ConvertToWIAOrRVZ(BlobReader* infile, const std::string& infile_path, const std::string& outfile_path, bool rvz, WIARVZCompressionType compression_type, int compression_level, - int chunk_size, CompressCB callback) + int chunk_size, const CompressCB& callback) { File::IOFile outfile(outfile_path, "wb"); if (!outfile) diff --git a/Source/Core/DiscIO/WIABlob.h b/Source/Core/DiscIO/WIABlob.h index dcdf38af97..e0d6a66d87 100644 --- a/Source/Core/DiscIO/WIABlob.h +++ b/Source/Core/DiscIO/WIABlob.h @@ -359,7 +359,8 @@ private: std::mutex* reusable_groups_mutex, GroupEntry* group_entry, u64* bytes_written); static ConversionResultCode RunCallback(size_t groups_written, u64 bytes_read, u64 bytes_written, - u32 total_groups, u64 iso_size, CompressCB callback); + u32 total_groups, u64 iso_size, + const CompressCB& callback); bool m_valid; WIARVZCompressionType m_compression_type;