mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-08-22 07:04:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

extractor: cleanup, support unicode properly, and add multi-game support (#1609)

Browse Source 
* extractor: refactor and cleanup for multi-game support

* deps: switch to `ghc::filesystem` as it is utf-8 everywhere by default

* extractor: finally working with unicode

* unicode: fix unicode cli args on windows in all `main` functions
This commit is contained in:
Tyler Wilding
2022-07-05 20:38:13 -04:00
committed by GitHub
parent ac1e620161
commit 6446389263
70 changed files with 7010 additions and 765 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decompiler/data/streamed_audio.cpp
+5 -5
View File
@@ -89,7 +89,7 @@ struct VagFileHeader {
/*!
* Read the DIR file into an AudioDir
*/
AudioDir read_audio_dir(const std::filesystem::path& path) {
AudioDir read_audio_dir(const fs::path& path) {
// matches the format in file.
struct DirEntry {
char name[8];
@@ -145,7 +145,7 @@ struct AudioFileInfo {
double length_seconds;
};
AudioFileInfo process_audio_file(const std::filesystem::path& output_folder,
AudioFileInfo process_audio_file(const fs::path& output_folder,
const std::vector<u8>& data,
const std::string& name,
const std::string& suffix) {
@@ -182,8 +182,8 @@ AudioFileInfo process_audio_file(const std::filesystem::path& output_folder,
return {vag_filename, (double)decoded_samples.size() / header.sample_rate};
}
void process_streamed_audio(const std::filesystem::path& output_path,
const std::filesystem::path& input_dir,
void process_streamed_audio(const fs::path& output_path,
const fs::path& input_dir,
const std::vector<std::string>& audio_files) {
auto dir_data = read_audio_dir(input_dir / "VAG" / "VAGDIR.AYB");
double audio_len = 0.f;
@@ -201,7 +201,7 @@ void process_streamed_audio(const std::filesystem::path& output_path,
for (size_t lang_id = 0; lang_id < audio_files.size(); lang_id++) {
auto& file = audio_files[lang_id];
auto wad_data = file_util::read_binary_file(input_dir / "VAG" / file);
auto suffix = std::filesystem::path(file).extension().u8string().substr(1);
auto suffix = fs::path(file).extension().u8string().substr(1);
langs.push_back(suffix);
dir_data.set_file_size(wad_data.size());
for (int i = 0; i < dir_data.entry_count(); i++) {