jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +10 -21
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 23807c9104 - Show all commits

20
src/Tools/Tools.code-workspace
View File

@ -41,11 +41,6 @@
"group": {
"kind": "build",
},
"options": {
"env": {
"CARGO_RUN_ARGS": "${input:cargo run args}"
}
}
},
{
"label": "cargo test",
@ -90,20 +85,9 @@
{
"id": "cargo target",
"type": "pickString",
"options": ["windows", "linux"],
"options": ["linux", "windows"],
"default": "linux",
"description": "The target for the tool to build"
},
{
"id": "cargo run args",
"type": "pickString",
"options": [
"",
"--help",
"--list -o ../Tests/Test_Planschbecken psx bin-cue ../Tests/ISO_Planschbecken.xml",
"--wsl -o Planschbecken.bin ../../../examples/PoolBox/application/bin/PSX-release/PoolBox.elf"
],
"default": "",
"description": "Argument options to pass to cargo run"
}
]
}

2
src/Tools/psxcdgen_ex/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "psxcdgen_ex"
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[profile.release]

9
src/Tools/psxcdgen_ex/src/lib.rs
View File

@ -233,8 +233,13 @@ fn parse_configuration(config: config_reader::Configuration) -> Result<(CDDesc,
}
for cd_da_file in cd_da_files {
let mut audio_io = hound::WavReader::open(&cd_da_file.file_path)?;
let header = audio_io.spec();
let mut audio_io = {
match hound::WavReader::open(&cd_da_file.file_path) {
Ok(audio_io) => Ok(audio_io),
Err(error) => Err(Error::from_text(format!("Failed to open CD Audio Track {} with error: {}", cd_da_file.file_path.to_string_lossy(), error)))
}
}?;
let header = audio_io.spec();
if header.sample_format != hound::SampleFormat::Int {
return Err(Error::from_text(format!("{}: Only integer WAV format (PCM) is supported for Audio tracks", cd_da_file.file_path.display())));